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:
b6e8a1e
)
dgit: Always canonicalise suite rather earlier
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Jul 2015 19:41:37 +0000
(20:41 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Jul 2015 19:43:43 +0000
(20:43 +0100)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 265978ea53cd0841de791d9aae3e409110caf4ac..f8b4fddabf46a87e7ce4b210ef24f6f83800b964 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-1897,10
+1897,12
@@
sub cmd_push {
if ($new_package) {
local ($package) = $existing_package; # this is a hack
canonicalise_suite();
- }
- if (defined $specsuite && $specsuite ne $isuite) {
+ } else {
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";
}