Thread (6 messages) flat view 6 messages, 3 authors, 2016-06-15

Re: [PATCH] add--interactive: respect diff.algorithm

From: Jeff King <hidden>
Date: 2016-06-15 22:57:43

Possibly related (same subject, not in this thread)

On Wed, Jun 12, 2013 at 07:44:10PM +0100, John Keeping wrote:
When staging hunks interactively it is sometimes useful to use an
alternative diff algorithm which splits the changes into hunks in a more
logical manner.  This is not possible because the plumbing commands
called by add--interactive ignore the "diff.algorithm" configuration
option (as they should).

Since add--interactive is a porcelain command it should respect this
configuration variable.  To do this, make it read diff.algorithm and
pass its value to the underlying diff-index and diff-files invocations.

At this point, do not add options to "git add", "git reset" or "git
checkout" (all of which can call git-add--interactive).  If a user want
s/want/wants/
quoted
  if (defined $diff_algorithm) {
          push @diff_cmd, "--diff-algorithm=$diff_algorithm";
  }
OK.  The "default" is actually "the value that is equivalent to 'myers'
for diff.algorithm" and I was originally going to add --diff-algorithm
to the command line unconditionally.
Yeah, that might have made sense, too, but the in-between (we know that
"default" is a special token and don't pass it) does not to me.

Patch looks obviously correct to me. Thanks.

-Peff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help