From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 1 Oct 2018 01:11:21 +0000 (+0100)
Subject: dgit: rearrange some strings to prep for translation
X-Git-Tag: archive/debian/7.0_pre1~30
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7fb2a936a03785890ac9a4601776bcddef8a4509;p=dgit.git

dgit: rearrange some strings to prep for translation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index f3aea0dc..2b4cad1a 100755
--- a/dgit
+++ b/dgit
@@ -4469,18 +4469,23 @@ END
 		}
 	    }
 	    if (@mode_changes) {
-		fail <<END.(join '', @mode_changes).<<END;
+		fail <<END.<<END
 HEAD specifies a different tree to $dscfn:
+END
 $diffs
 END
+		    .(join '', @mode_changes)
+		    .<<END;
 There is a problem with your source tree (see dgit(7) for some hints).
 To see a full diff, run git diff $tree $referent
 END
 	    }
 
-	    fail <<END;
+	    fail <<END.<<END.<<END;
 HEAD specifies a different tree to $dscfn:
+END
 $diffs
+END
 Perhaps you forgot to build.  Or perhaps there is a problem with your
  source tree (see dgit(7) for some hints).  To see a full diff, run
    git diff $tree $referent