Ramkumar Ramachandra artag...@gmail.com writes:
The following bug has been observed since rr/rebase-autostash:
$ git am # no input file
^C
$ git am --abort
Resolve operation not in progress, we are not resuming.
This happens because the following test fails:
test -d $dotest
Junio C Hamano wrote:
Perhaps _that_ guarding condition is what needs
to be fixed, by reverting it back to just does $dotest exist?
Adding a single case workaround smells like a band-aid to me.
Like I pointed out earlier, the original codepath is not equipped to
handle this case. A normal
Ramkumar Ramachandra artag...@gmail.com writes:
Junio C Hamano wrote:
Perhaps _that_ guarding condition is what needs
to be fixed, by reverting it back to just does $dotest exist?
Adding a single case workaround smells like a band-aid to me.
Like I pointed out earlier, the original
Junio C Hamano wrote:
Hmph, when did ORIG_HEAD set, and what commit does it point at?
By some unrelated previous operation (eg. pull, rebase, merge). The
point is that at any point in normal operation, ORIG_HEAD exists,
and usually points to @~N, for some N. If I rm .git/ORIG_HEAD by
hand, the
Ramkumar Ramachandra artag...@gmail.com writes:
But that is entirely an independent issue (I am going to agree with
you in the end).
Exactly. It might be nice to fix those two things (are there any
observed bugs?), but it is entirely orthogonal to our issue.
OK.
That is a correct
5 matches
Mail list logo