summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-13 00:40:19 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-13 00:40:19 -0800
commit1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed (patch)
tree71ca0e8d6b33a53c3927748ca027c49277061cdb /git-rebase--interactive.sh
parent9279bf3ab6739cd5854c21418c5d28412287ba07 (diff)
parent12dd1112886f18730ee471420619e77783cd5943 (diff)
downloadgit-1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed.tar.gz
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: Avoid spurious error messages on error mistakes. contrib/examples/README: give an explanation of the status of these files
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index c8b0861c08..8ed2244819 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -349,7 +349,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