Re: What's cooking in git.git (Nov 2010, #03; Wed, 24)
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Nov 25, 2010, 16:26 UTC
- Message-ID
- <m3ipzl4bfn.fsf@localhost.localdomain>
- In-Reply-To
- <7vk4k2rt2m.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 5 quoted lines
> * tr/config-doc (2010-10-24) 2 commits > . Documentation: complete config list from other manpages > . Documentation: Move variables from config.txt to separate file > > This unfortunately heavily conflicts with patches in flight...
The first patch in series can be automatically generated e.g. using the following Perl script. I have succesfully rebased this series on top of current 'master' using it (checkout + script + commit), see 't/doc-config-extraction' branch in my clone of git repo: http://repo.or.cz/w/git/jnareb-git.git (can't push currently here) http://github.com/jnareb/git
Though that doesn't help with issues with second patch in this series, which were discussed on git mailing list when sending it.
-- >8 -- #!/usr/bin/perl
use strict; use warnings;
my ($in, $out, $line);
open $in, '<', "Documentation/config.txt" or die "$!";
open $out, '>', "Documentation/config.txt+"
or die "$!";
while ($line = <$in>) {
last if ($line =~ /^.*::$/);
print {$out} $line;
}
close $out;open $out, '>', "Documentation/config-vars.txt"
or die "$!";
print {$out} $line;
while ($line = <$in>) {
print {$out} $line;
}
close $out;open $out, '>>', "Documentation/config.txt+"
or die "$!";
print {$out} "include:config-vars.txt[]\n";
close $out;rename "Documentation/config.txt+", "Documentation/config.txt" or die "$!";
__END__ -- 8< --
-- Jakub Narebski Poland ShadeHawk on #git