From 9a9cd82a30b959cc920cb88e520eca7f84bce573 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 28 May 2022 21:44:28 +0100 Subject: 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 --- git-debrebase | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'git-debrebase') 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", -- cgit v1.2.3