diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-05-28 21:44:28 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-05-28 22:04:01 +0100 |
| commit | 9a9cd82a30b959cc920cb88e520eca7f84bce573 (patch) | |
| tree | 75c616394cca115106b3e483de8d6aec41bf6a0b | |
| parent | 5c492172d81bfa64cf5f526c862171d3cbdba208 (diff) | |
git-debrebase: convert-from-dgit-view: turn off ignore-new
Pass this option in the place where it's needed. Via the config file
so things still work with old gbp.
Part of #1005873.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rwxr-xr-x | git-debrebase | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index 7814358..08938e2 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2790,12 +2790,16 @@ END if ($some_patches) { runcmd @git, qw(checkout), $head, qw(-- debian/patches); runcmd @git, qw(reset --quiet); + # We deliberately run with dirty patches, so want --ignore-new + # but it isn't available everywhere + playtree_write_gbp_conf('true'); my @gbp_cmd = (qw(gbp pq import)); if (!$diagnose) { my $gbp_err = "../gbp-pq-err"; @gbp_cmd = shell_cmd "exec >$gbp_err 2>&1", @gbp_cmd; } my $r = system @gbp_cmd; + playtree_write_gbp_conf(); if ($r) { print STDERR f_ " %s: couldn't apply patches: gbp pq %s", |