Avoid spurious error messages on error mistakes.
Prior to that, if the user chose "squash" as a first action, the stderr looked like: grep: /home/madcoder/dev/scm/git/.git/rebase-merge/done: No such file or directory Cannot 'squash' without a previous commit Now the first line is gone. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pierre Habouzit committed
Jan 13, 2009 at 00:09 UTC
12dd1112886f18730ee471420619e77783cd5943
1 file changed
+1
-1
git-rebase--interactive.sh
+1
-1
@@ -309,7 +309,7 @@ do_next () {
309
squash|s)
310
comment_for_reflog squash
311
312
- has_action "$DONE" ||
312
+ test -f "$DONE" && has_action "$DONE" ||
313
die "Cannot 'squash' without a previous commit"
314
315
mark_action_done