From 92ed16906cd40e617219fb63807d1f37bb679b0e Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Aug 2013 16:52:07 +0100
Subject: [PATCH] improve an error message; fix fetch when we have already
 fetched

---
 dgit | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 $!;
-- 
2.30.2