chiark / gitweb /
improve an error message; fix fetch when we have already fetched
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Aug 2013 15:52:07 +0000 (16:52 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Aug 2013 15:52:07 +0000 (16:52 +0100)
dgit

diff --git a/dgit b/dgit
index be77694..666e2b2 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -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 $!;