chiark / gitweb /
dgit: rearrange some strings to prep for translation
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 1 Oct 2018 01:11:21 +0000 (02:11 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 1 Oct 2018 02:43:04 +0000 (03:43 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

diff --git a/dgit b/dgit
index f3aea0dc47bb80c43b6b0877866ab6a028f6dc71..2b4cad1a438cc4b93d546211d805b5d204cd83d3 100755 (executable)
--- 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