Re: [PATCH v15 8/9] difftool: teach difftool to handle directory diffs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Tim Henigan <tim.henigan@xxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]