X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=40c7f3ec2f007aff628452690e049e7a6f15b193;hb=ded07ffa9b1056c1a0f27c3b51ba81c3cb16b0ff;hp=92f96cefc295e79c33daa73d3e05c62d9ad7c9ac;hpb=a4264dc02181058e3c94227bb6686aeed308e285;p=dgit.git diff --git a/dgit b/dgit index 92f96cef..40c7f3ec 100755 --- a/dgit +++ b/dgit @@ -2596,9 +2596,20 @@ updates to users of the official Debian archive view of the package. [dgit version $our_version] --- END - die 'xxx gitignore'; - + close GIPATCH or die "$gipatch: $!"; + runcmd shell_cmd "exec >>$gipatch", @git, qw(diff), + $unapplied, $headref, "--", keys %$editedignores; + open SERIES, "+>>", "debian/patches/series" or die $!; + defined seek SERIES, -1, 2 or $!==EINVAL or die $!; + my $newline; + defined read SERIES, $newline, 1 or die $!; + 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; + commit_admin "Commit patch to update .gitignore"; } + die 'xxx memoisation via git-reflog'; die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)'; }