chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit(1): Fix --force-import-dsc-with-dgit-field
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index f6c845d967da3d2083890f9ff832f999204ac00d..d62694a90818c7d461324381f57a3eb4d6b3afc2 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-4299,7
+4299,8
@@
sub fetchpullargs () {
$isuite = branchsuite();
if (!$isuite) {
my $clogp = parsechangelog();
$isuite = branchsuite();
if (!$isuite) {
my $clogp = parsechangelog();
- $isuite = getfield $clogp, 'Distribution';
+ my $clogsuite = getfield $clogp, 'Distribution';
+ $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
}
} elsif (@ARGV==1) {
($isuite) = @ARGV;
}
} elsif (@ARGV==1) {
($isuite) = @ARGV;
@@
-5415,6
+5416,7
@@
sub quilt_fixup_multipatch ($$$) {
rmtree '.pc';
rmtree '.pc';
+ runcmd @git, qw(checkout -f), $headref, qw(-- debian);
my $unapplied=git_add_write_tree();
printdebug "fake orig tree object $unapplied\n";
my $unapplied=git_add_write_tree();
printdebug "fake orig tree object $unapplied\n";