git-svn: Protect against "diff.color = true".

If the configuration of the user has "diff.color = true", the
output from "log" we invoke internally added color codes, which
broke the parser.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tested-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Acked-by: Eric Wong <normalperson@yhbt.net>

diff --git a/git-svn.perl b/git-svn.perl
index 4e325b771ba136e40b9a420e16f043fbaf5d7bb7..98218dabd993f982fbad02c9467129d9d8303b03 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -807,7 +807,7 @@ sub cmt_metadata {
 
 sub working_head_info {
        my ($head, $refs) = @_;
 
 sub working_head_info {
        my ($head, $refs) = @_;

-       my ($fh, $ctx) = command_output_pipe('log', $head);
+       my ($fh, $ctx) = command_output_pipe('log', '--no-color', $head);

        my $hash;
        my %max;
        while (<$fh>) {
        my $hash;
        my %max;
        while (<$fh>) {


@@ -2072,7 +2072,7 @@ sub rebuild {
                return;
        }
        print "Rebuilding $db_path ...\n";
                return;
        }
        print "Rebuilding $db_path ...\n";

-       my ($log, $ctx) = command_output_pipe("log", $self->refname);
+       my ($log, $ctx) = command_output_pipe("log", '--no-color', $self->refname);

        my $latest;
        my $full_url = $self->full_url;
        remove_username($full_url);
        my $latest;
        my $full_url = $self->full_url;
        remove_username($full_url);