Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/add-i-custom-diff-algo'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 27 Jun 2013 21:30:07 +0000
(14:30 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 27 Jun 2013 21:30:07 +0000
(14:30 -0700)
* jk/add-i-custom-diff-algo:
add -i: add extra options at the right place in "diff" command line
add--interactive: respect diff.algorithm
git-add--interactive.perl
patch
|
blob
|
history
raw
(from parent 1:
644daa9
)
diff --git
a/git-add--interactive.perl
b/git-add--interactive.perl
index d2c4ce6e1e88f543bd06cd8347e8949fef11a381..75a991f7ec8a2e4926cb925ad9ff23be2f6aedeb 100755
(executable)
--- a/
git-add--interactive.perl
+++ b/
git-add--interactive.perl
@@
-44,6
+44,8
@@
my $normal_color = $repo->get_color("", "reset");
+my $diff_algorithm = $repo->config('diff.algorithm');
+
my $use_readkey = 0;
my $use_termcap = 0;
my %term_escapes;
@@
-731,6
+733,9
@@
sub run_git_apply {
sub parse_diff {
my ($path) = @_;
my @diff_cmd = split(" ", $patch_mode_flavour{DIFF});
+ if (defined $diff_algorithm) {
+ splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}";
+ }
if (defined $patch_mode_revision) {
push @diff_cmd, $patch_mode_revision;
}