kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Pierre Habouzit 2009-01-13 00:09:36 +01:00 committed by Junio C Hamano
parent 47a845bfc3
commit 12dd111288
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--interactive.sh
View File

@ -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