git/diff.c, branch v1.8.2.2

Merge branch 'jk/diff-algo-finishing-touches' into maint

2013-04-24T23:19:42Z

"git diff --diff-algorithm=algo" was understood by the command line parser, but "git diff --diff-algorithm algo" was not. * jk/diff-algo-finishing-touches: diff: allow unstuck arguments with --diff-algorithm git-merge(1): document diff-algorithm option to merge-recursive

Correct common spelling mistakes in comments and tests

2013-04-12T20:38:40Z

Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini Signed-off-by: Jonathan Nieder Acked-by: Matthieu Moy Signed-off-by: Junio C Hamano

diff: allow unstuck arguments with --diff-algorithm

2013-04-05T18:01:08Z

The argument to --diff-algorithm is mandatory, so there is no reason to require the argument to be stuck to the option with '='. Change this for consistency with other Git commands. Note that this does not change the handling of diff-algorithm in merge-recursive.c since the primary interface to that is via the -X option to 'git merge' where the unstuck form does not make sense. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint

2013-04-01T16:19:47Z

* ap/maint-diff-rename-avoid-overlap: tests: make sure rename pretty print works diff: prevent pprint_rename from underrunning input diff: Fix rename pretty-print when suffix and prefix overlap

diff.c: diff.renamelimit => diff.renameLimit in message

2013-03-21T21:06:49Z

In the warning message printed when rename or unmodified copy detection was skipped due to too many files, change "diff.renamelimit" to "diff.renameLimit", in order to make it consistent with git documentation, which consistently uses "diff.renameLimit". Signed-off-by: Max Nanasy Signed-off-by: Junio C Hamano

diff: prevent pprint_rename from underrunning input

2013-02-26T21:01:34Z

The logic described in d020e27 (diff: Fix rename pretty-print when suffix and prefix overlap, 2013-02-23) is wrong: The proof in the comment is valid only if both strings are the same length. *One* of old/new can reach a-1 (b-1, resp.) if 'a' is a suffix of 'b' (or vice versa). Since the intent was to let the loop run down to the '/' at the end of the common prefix, fix it by making that distinction explicit: if there is no prefix, allow no underrun. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

diff: Fix rename pretty-print when suffix and prefix overlap

2013-02-24T07:52:39Z

When considering a rename for two files that have a suffix and a prefix that can overlap, a confusing line is shown. As an example, renaming "a/b/b/c" to "a/b/c" shows "a/b/{ => }/b/c". Currently, what we do is calculate the common prefix ("a/b/"), and the common suffix ("/b/c"), but the same "/b/" is actually counted both in prefix and suffix. Then when calculating the size of the non-common part, we end-up with a negative value which is reset to 0, thus the "{ => }". Do not allow the common suffix to overlap the common prefix and stop when reaching a "/" that would be in both. Signed-off-by: Antoine Pelisse Signed-off-by: Junio C Hamano

Merge branch 'mp/diff-algo-config'

2013-02-17T23:25:52Z

Add diff.algorithm configuration so that the user does not type "diff --histogram". * mp/diff-algo-config: diff: Introduce --diff-algorithm command line option config: Introduce diff.algorithm variable git-completion.bash: Autocomplete --minimal and --histogram for git-diff

Merge branch 'jk/diff-graph-cleanup'

2013-02-14T18:29:59Z

Refactors a lot of repetitive code sequence from the graph drawing code and adds it to the combined diff output. * jk/diff-graph-cleanup: combine-diff.c: teach combined diffs about line prefix diff.c: use diff_line_prefix() where applicable diff: add diff_line_prefix function diff.c: make constant string arguments const diff: write prefix to the correct file graph: output padding for merge subsequent parents

diff.c: use diff_line_prefix() where applicable

2013-02-12T19:42:07Z

Signed-off-by: John Keeping Signed-off-by: Junio C Hamano