"Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes: > During git-rebase --interactive's --continue implementation we used > to silently restart the rebase if the user had made the commit > for us. This is common if the user stops to edit a commit and > does so by amending it. My recent change to watch git-commit's > exit status broke this behavior. > > Thanks to Bernt Hansen for catching it in 1.5.4-rc1. > > Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx> > --- > git-rebase--interactive.sh | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index 47581ce..39f32b1 100755 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -372,8 +372,9 @@ do > test ! -f "$DOTEST"/amend || git reset --soft HEAD^ > } && > export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE && > - git commit --no-verify -F "$DOTEST"/message -e || > + if ! git commit --no-verify -F "$DOTEST"/message -e > die "Could not commit staged changes." > + fi This looks like a syntax error to me. - To unsubscribe from this list: 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
