From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Aug 2013 15:52:07 +0000 (+0100)
Subject: improve an error message; fix fetch when we have already fetched
X-Git-Tag: debian/0.3~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=92ed16906cd40e617219fb63807d1f37bb679b0e;ds=sidebyside

improve an error message; fix fetch when we have already fetched
---

diff --git a/dgit b/dgit
index be776940..666e2b2c 100755
--- 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 $!;