git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 23, 2012, 19:04 UTC
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:
Show 17 quoted lines
> +	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.
Previous: Tim Henigan
Message 2 of 2 in “difftool: teach difftool to handle directory diffs”
  1. 8/9 difftool: teach difftool to handle directory diffsTim Henigan, Apr 23, 2012
  2. Junio C HamanoApr 23, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.