On 22/06/06, Yann Dirson <ydirson@xxxxxxxxxx> wrote:
- "push --undo" is not robust. On the occasion reproduced below, I had to rollback the push myself by hand-modifying the stgit data, which took me some effort. I'll have to gather precise info, but the issue occurs on patch reordering, on a genuine conflict, and seems to be involve a change to a non-existent file, when that file would have been added by a non-applied patch originally below the one I attempted to apply.
I fixed this bug and I'll push the changes tonight. It was caused by a "git-diff-index" call with files but without the "--" argument. When the file was actually missing from the repository, git was confused and returned an error. The 'status --reset' command was failing in this situation as well. -- Catalin - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html