summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-01 02:11:21 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-01 03:43:04 +0100
commit7fb2a936a03785890ac9a4601776bcddef8a4509 (patch)
tree56a685f5a36a9553ebc0e58c554f6b7d065ca342
parent4c9a33a8aa3e68508b240d0460ca462d823525fa (diff)
dgit: rearrange some strings to prep for translation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit9
1 files changed, 7 insertions, 2 deletions
diff --git a/dgit b/dgit
index f3aea0d..2b4cad1 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