add -i: add extra options at the right place in "diff" command line
Appending "--diff-algorithm=histogram" at the end of canned command line for various modes of "diff" is correct for most of them but not for "stash" that has a non-option already wired in, like so: 'stash' => { DIFF => 'diff-index -p HEAD', Appending an extra option after non-option may happen to work due to overly lax command line parser, but that is not something we should rely on. Instead, splice in the extra argument immediately after the command name (i.e. 'diff-index', 'diff-files', etc.). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 23, 2013 at 12:19 UTC
e5c29097826be86e2f18139491cdf9c830c7fa3e
1 file changed
+1
-1
git-add--interactive.perl
+1
-1
@@ -734,7 +734,7 @@ 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}";
737
+ splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}";
738
}
739
if (defined $patch_mode_revision) {
740
push @diff_cmd, $patch_mode_revision;