chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test suite: Provide t-ref-same-exact
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 265978ea53cd0841de791d9aae3e409110caf4ac..47e05f79727dda47e76dc230851300c97d26b0fc 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-111,7
+111,7
@@
sub lref () { return "refs/heads/".lbranch(); }
sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
sub rrref () { return server_ref($csuite); }
sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
sub rrref () { return server_ref($csuite); }
-sub lrfetchrefs () { return "refs/dgit-fetch/$
i
suite"; }
+sub lrfetchrefs () { return "refs/dgit-fetch/$
c
suite"; }
sub stripepoch ($) {
my ($vsn) = @_;
sub stripepoch ($) {
my ($vsn) = @_;
@@
-1897,10
+1897,12
@@
sub cmd_push {
if ($new_package) {
local ($package) = $existing_package; # this is a hack
canonicalise_suite();
if ($new_package) {
local ($package) = $existing_package; # this is a hack
canonicalise_suite();
- }
- if (defined $specsuite && $specsuite ne $isuite) {
+ } else {
canonicalise_suite();
canonicalise_suite();
- $csuite eq $specsuite or
+ }
+ if (defined $specsuite &&
+ $specsuite ne $isuite &&
+ $specsuite ne $csuite) {
fail "dgit push: changelog specifies $isuite ($csuite)".
" but command line specifies $specsuite";
}
fail "dgit push: changelog specifies $isuite ($csuite)".
" but command line specifies $specsuite";
}