X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=ddb7840cf997236d4d604c6468f84923209a2e53;hp=c28a775ce87261022855fcbb753c6d8b82ee9056;hb=238568870c670cd067578807c0a4f369f9af1c8a;hpb=180a9c094c1b1e51281c70940dc451465ec04806

diff --git a/git-debrebase b/git-debrebase
index c28a775c..ddb7840c 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -270,7 +270,7 @@ sub snags_maybe_bail () {
 		$us, $snags_tripped;
 	} else {
 	    fail sprintf
-  "%s: snags: %d blockers (you could -f<tag>, or --force)",
+  "%s: snags: %d blocker(s) (you could -f<tag>, or --force)",
 		$us, $snags_tripped;
 	}
     }
@@ -992,12 +992,12 @@ sub record_ffq_prev_deferred () {
     # if "deferred", will have added something about that to
     #   @deferred_update_messages, and also maybe printed (already)
     #   some messages about ff checks
+    my $currentval = get_head();
+
     my ($status, $message, $current, $ffq_prev, $gdrlast)
 	= ffq_prev_branchinfo();
     return ($status, $message) unless $status eq 'branch';
 
-    my $currentval = get_head();
-
     my $exists = git_get_ref $ffq_prev;
     return ('exists',"$ffq_prev already exists") if $exists;