From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Apr 2012 19:04:04 GMT
Subject: Re: [PATCH v15 8/9] difftool: teach difftool to handle directory diffs
Message-ID: <xmqq1unejmmz.fsf@junio.mtv.corp.google.com>
In-Reply-To: <1335205421-19295-1-git-send-email-tim.henigan@gmail.com>

Tim Henigan <tim.henigan@gmail.com> writes:

> +	while ($i < $#rawdiff) {
> +		if ($rawdiff[$i] =~ /^::/) {
> +			print "Combined diff formats ('-c' and '--cc') are not supported in directory diff mode.\n";
> +			exit(1);
> +		}
> +
> +		my ($lmode, $rmode, $lsha1, $rsha1, $status) = split(' ', substr($rawdiff[$i], 1));
> +		my $src_path = $rawdiff[$i + 1];
> +		my $dst_path;
> +
> +		if ($status =~ /^[CR]/) {
> +			$dst_path = $rawdiff[$i + 2];
> +			$i += 3;
> +		} else {
> +			$dst_path = $src_path;
> +			$i += 2;
> +		}

The update to this part looks good to me ;-)

Thanks.  Will replace what is queued.