summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-31 21:29:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-01 06:22:51 (GMT)
commiteeebd8d8c5ab63494abe200b30a840aa99ee7412 (patch)
tree61ff530d5e5061742518c111876c36522db59d93
parentf95eef15f2f8a336b9a42749f5458c841a5a5d63 (diff)
downloadgit-eeebd8d8c5ab63494abe200b30a840aa99ee7412.zip
git-eeebd8d8c5ab63494abe200b30a840aa99ee7412.tar.gz
git-eeebd8d8c5ab63494abe200b30a840aa99ee7412.tar.bz2
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>
-rwxr-xr-xgit-svn.perl4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 4e325b7..98218da 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -807,7 +807,7 @@ sub cmt_metadata {
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>) {
@@ -2072,7 +2072,7 @@ sub rebuild {
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);