New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
git-cola often interfers with git interactive rebase #99
Comments
This has happened many times to me too. It would be great to have it fixed. |
Are you using the most recent git-cola, or is it packaged by the distribution? git-cola calls I'd be satisfied by moving the |
... or better yet ... the 'Rescan' button should do the full update and the normal operations can just do the read-only operations. Then we don't need to add a new menu action, etc. |
I've been using the Fedora package for git-cola for about 2 years and the current version is 1.4.3.5. I like the proposed solution. |
I had it happen to me with 1.7.1.1. I really can't speculate about what would be the best solution though, as I'm not versed into what the role of "git update-index" is, and at what times it would be most appropriate to call. But yeah, using the index in read only when possible "sounds" good :) |
git-cola no longer calls We still call it once at startup, which is okay since that is not the part that was interfering. Please let me know if you still encounter this problem. There's a short list of git commands that get run to check the status and they're supposed to all be read-only. If we find that this is not the case then we can ask for help on the git mailing list. |
sorry, I just tried again from master and it's not resolved (simply did "git pull" then "make" then executed bin/git-cola, that should suffice right?)... wish I could help more... is there a way to get traces of what happens? |
If you set the GIT_COLA_TRACE environment variable to '1' then it'll print commands to the shell. ... and that just pointed out what's happening. It looks like the inotify code uses a different mechanism to update the status. It ends up calling
The inotify code was somewhat recently changed by Karl B. and I think the |
Avoid 'git diff' which refreshes the index and thus interferes with concurrant git processes. Closes git-cola#99 Signed-off-by: David Aguilar <davvid@gmail.com>
haven't had it happen yet, so it seems ok. Though when I do such a rebase, sometimes the "Commit Message Editor" window gets filled with a commit message, especially if I do a "reword" of a commit during interactive rebase. But at least it doesn't make the rebase lock like it used to. Tested with f97ab8d |
Most of the time, when I try to do an interactive rebase (git rebase HEAD~10 -i), and re-order/reword some commits, the operation fails if git-cola is open in the background. Here's what git rebase says:
it's quite annoying that I have to close git-cola each time before doing interactive rebasing, because I do that often. I actually made a bash macro to always kill git-cola before rebases, but a more permanent solution for everyone would be better...
The text was updated successfully, but these errors were encountered: