diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-04-15 18:05:09 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-04-15 18:05:09 +0100 |
commit | 233fa856bec4d90e55531f54b81a264273cd4cb8 (patch) | |
tree | 9c64a0304097bfff9a8d9cd1155de4c906502990 /dgit | |
parent | 96ac307f0b9d186d589d221dabfb0e403169aa08 (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-x | dgit | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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(); |