@matheusbsbs / matheus-bagliano / commits / 2cc0f53b53

add--interactive: respect diff.algorithm

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 wants to override the value on the command line they can use: git -c diff.algorithm=$ALGO ... Signed-off-by: John Keeping <john@keeping.me.uk> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

John Keeping committed Jun 12, 2013 at 19:44 UTC 2cc0f53b53e7d5456ec45713a201142754d69249

1 file changed +5

git-add--interactive.perl

@@ -44,6 +44,8 @@ my ($diff_new_color) =

45 my $normal_color = $repo->get_color("", "reset");

47 +my $diff_algorithm = $repo->config('diff.algorithm');

48 +

49 my $use_readkey = 0;

50 my $use_termcap = 0;

51 my %term_escapes;

@@ -731,6 +733,9 @@ sub run_git_apply {

733 sub parse_diff {

734 my ($path) = @_;

735 my @diff_cmd = split(" ", $patch_mode_flavour{DIFF});

736 + if (defined $diff_algorithm) {

737 + push @diff_cmd, "--diff-algorithm=${diff_algorithm}";

738 + }

739 if (defined $patch_mode_revision) {

740 push @diff_cmd, $patch_mode_revision;

741 }