Re: Different diff strategies in add --interactive

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 10, 2013, 19:28 UTC
Message-ID: <7v38sphiiw.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130610142825.GI22905@serenity.lan>

John Keeping <john@keeping.me.uk> writes:

Show 6 quoted lines

> I think the first thing to do is read the "diff.algorithm" setting in
> git-add--interactive and pass its value to the underlying diff-index and
> diff-files commands, but should we also have a command line parameter to
> git-add to specify the diff algorithm in interactive mode?  And if so,
> can we simply add "--diff-algorithm" to git-add, or is that too
> confusing?

Making "git add--interactive" read from diff.algorithm is probably a good idea, because the command itself definitely is a Porcelain. We would probably need a way to defeat the configured default for completeness, either:

    git add -p --diff-algorithm=default
    git -c diff.algorithm=default add -p

but I suspect that a new option to "git add" that only takes effect together with "-p" is probably an overkill, only in order to support the former and not having to say the latter, but I can be persuaded either way.

As long as "git add --diff-algorithm=foo" without "-i" or "-p" option lets the user know it has no effect (error out, give warning and continue, etc. whose details I do not deeply care), that is.