Skip to content

Commit

Permalink
Avoid spurious error messages on error mistakes.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
MadCoder authored and gitster committed Jan 13, 2009
1 parent 47a845b commit 12dd111
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 12dd111

Please sign in to comment.