development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid spurious error messages on error mistakes.

Browse source 
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>
This commit is contained in:
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) squash|s)
comment_for_reflog squash comment_for_reflog squash
has_action "$DONE" || test -f "$DONE" && has_action "$DONE" ||
die "Cannot 'squash' without a previous commit" die "Cannot 'squash' without a previous commit"
mark_action_done mark_action_done