mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/add-i-custom-diff-algo'

Browse Source 
* jk/add-i-custom-diff-algo:
  add -i: add extra options at the right place in "diff" command line
  add--interactive: respect diff.algorithm
This commit is contained in:
Junio C Hamano
2013-06-27 14:30:07 -07:00
parent 644daa9428 e5c2909782
commit 91fc159745
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
git-add--interactive.perl
View File

@ -44,6 +44,8 @@ my ($diff_new_color) =
my $normal_color = $repo->get_color("", "reset"); my $normal_color = $repo->get_color("", "reset");
my $diff_algorithm = $repo->config('diff.algorithm');
my $use_readkey = 0; my $use_readkey = 0;
my $use_termcap = 0; my $use_termcap = 0;
my %term_escapes; my %term_escapes;
@ -731,6 +733,9 @@ sub run_git_apply {
sub parse_diff { sub parse_diff {
my ($path) = @_; my ($path) = @_;
my @diff_cmd = split(" ", $patch_mode_flavour{DIFF}); 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) { if (defined $patch_mode_revision) {
push @diff_cmd, $patch_mode_revision; push @diff_cmd, $patch_mode_revision;
} }