diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | dgit | 6 | ||||
| -rwxr-xr-x | git-debrebase | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 04357f9..375e783 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dgit (5.8~) unstable; urgency=medium Bugfixes: + * dgit, git-debrebase: Properly make patches even if an awkward + .gitignore ignores the things in debian/patches. Closes:#903130. * dgit(1): Unscramble push[-source] descriptions. Closes:#903116. -- @@ -3812,11 +3812,11 @@ sub quiltify_nofix_bail ($$) { } sub commit_quilty_patch () { - my $output = cmdoutput @git, qw(status --porcelain); + my $output = cmdoutput @git, qw(status --ignored --porcelain); my %adds; foreach my $l (split /\n/, $output) { next unless $l =~ m/\S/; - if ($l =~ m{^(?:\?\?| [MADRC]) (.pc|debian/patches)}) { + if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) { $adds{$1}++; } } @@ -5318,7 +5318,7 @@ END print SERIES "\n" or die $! unless $newline eq "\n"; print SERIES "auto-gitignore\n" or die $!; close SERIES or die $!; - runcmd @git, qw(add -- debian/patches/series), $gipatch; + runcmd @git, qw(add -f -- debian/patches/series), $gipatch; commit_admin <<END Commit patch to update .gitignore diff --git a/git-debrebase b/git-debrebase index 658884d..04befff 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1504,7 +1504,7 @@ sub make_patches_staged ($) { { local ($!,$?); copy('../gbp-pq-err', \*STDERR); } failedcmd @gbp_cmd; } - runcmd @git, qw(add debian/patches); + runcmd @git, qw(add -f debian/patches); }; } |