summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-04-15 18:05:09 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-04-15 18:05:09 +0100
commit233fa856bec4d90e55531f54b81a264273cd4cb8 (patch)
tree9c64a0304097bfff9a8d9cd1155de4c906502990 /dgit
parent96ac307f0b9d186d589d221dabfb0e403169aa08 (diff)
Fix inaccurate error message when archive's git hash is not an ancestor of git repo's git hash.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit4
1 files changed, 2 insertions, 2 deletions
diff --git a/dgit b/dgit
index 2e67eb5..a73fffd 100755
--- a/dgit
+++ b/dgit
@@ -1355,8 +1355,8 @@ $later_warning_msg
END
$hash = $lastpush_hash;
} else {
- fail "archive's .dsc refers to ".$dsc_hash.
- " but this is an ancestor of ".$lastpush_hash;
+ fail "git head (".lrref()."=$lastpush_hash) is not a ".
+ "descendant of archive's .dsc hash ($dsc_hash)";
}
} elsif ($dsc) {
$hash = generate_commit_from_dsc();