X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-rebase--interactive.sh;h=59c148ff6d477c5c40258d3adc5c95f5c775ccc6;hb=2454ac7b9fbc12db5cca8cd388422360528d7d6f;hp=124cb5846b07ee9aa72fac4cbb88098c94f5741a;hpb=a38bb0cc0fc98bf868ad48dc11d229addcca586c;p=git.git

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