chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
00a244b
)
improve an error message; fix fetch when we have already fetched
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 17 Aug 2013 15:52:07 +0000
(16:52 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 17 Aug 2013 15:52:07 +0000
(16:52 +0100)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index be7769400a8f643071fd077a4c91ef8e18e23c5c..666e2b2c8ad8fca044ea8a39fafe44dc3a8ec2a5 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;
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 $!;
}
}
chdir '../../../..' or die $!;