diff options
| author | Pierre Habouzit <madcoder@debian.org> | 2009-01-13 00:09:36 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-13 00:21:31 -0800 |
| commit | 12dd1112886f18730ee471420619e77783cd5943 (patch) | |
| tree | a57a3c570b875ad110c46c1225e6943d1655364a /git-rebase--interactive.sh | |
| parent | 47a845bfc3a9e1d378c43c3b3ea4291d5d79eca8 (diff) | |
| download | git-12dd1112886f18730ee471420619e77783cd5943.tar.gz git-12dd1112886f18730ee471420619e77783cd5943.tar.xz | |
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>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 124cb5846..59c148ff6 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -309,7 +309,7 @@ do_next () { squash|s) comment_for_reflog squash - has_action "$DONE" || + test -f "$DONE" && has_action "$DONE" || die "Cannot 'squash' without a previous commit" mark_action_done |