diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-17 16:52:07 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-17 16:52:07 +0100 |
commit | 92ed16906cd40e617219fb63807d1f37bb679b0e (patch) | |
tree | dad60e1d0c290be56cd1438bc808832f3741776c | |
parent | 00a244b9078b88e899fc00c6d799bdd601c40c70 (diff) |
improve an error message; fix fetch when we have already fetched
-rwxr-xr-x | dgit | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -414,10 +414,11 @@ Last allegedly pushed/uploaded: $oldclogp->{Version} (newer or same) Perhaps the upload is stuck in incoming. Using the version from git. END $outputhash = $upload_hash; - } else { - die "version in archive is same as version in git". - " to-be-uploaded (upload/) branch but archive". - " version hash no commit hash?!\n"; + } elsif ($outputhash ne $upload_hash) { + die "version in archive ($clogp->{Version})". + " is same as version in git". + " to-be-uploaded (upload/) branch ($oldclogp->{Version})". + " but archive version hash no commit hash?!\n"; } } chdir '../../../..' or die $!; |