git/xdiff, branch v1.6.4

refactor: use bitsizeof() instead of 8 * sizeof()

2009-07-23T04:57:41Z

Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint

2009-06-02T14:48:44Z

* cb/maint-1.6.0-xdl-merge-fix: Change xdl_merge to generate output even for null merges t6023: merge-file fails to output anything for a degenerate merge Conflicts: xdiff/xmerge.c

Change xdl_merge to generate output even for null merges

2009-05-25T06:56:34Z

xdl_merge used to have a check to ensure that there was at least some change in one or other side being merged but this suppressed output for the degenerate case when base, local and remote contents were all identical. Removing this check enables correct output in the degenerate case and xdl_free_script handles freeing NULL scripts so there is no need to have the check for these calls. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

Fix typos / spelling in comments

2009-04-23T02:02:12Z

Signed-off-by: Mike Ralphson Signed-off-by: Junio C Hamano

Fix various dead stores found by the clang static analyzer

2009-03-16T01:25:24Z

http-push.c::finish_request(): request is initialized by the for loop index-pack.c::free_base_data(): b is initialized by the for loop merge-recursive.c::process_renames(): move compare to narrower scope, and remove unused assignments to it remove unused variable renames2 xdiff/xdiffi.c::xdl_recs_cmp(): remove unused variable ec xdiff/xemit.c::xdl_emit_diff(): xche is always overwritten Signed-off-by: Benjamin Kramer Signed-off-by: Junio C Hamano

Merge branch 'js/patience-diff'

2009-01-24T05:51:38Z

* js/patience-diff: bash completions: Add the --patience option Introduce the diff option '--patience' Implement the patience diff algorithm Conflicts: contrib/completion/git-completion.bash

Merge branch 'kc/maint-diff-bwi-fix'

2009-01-22T01:07:51Z

* kc/maint-diff-bwi-fix: Fix combined use of whitespace ignore options to diff

Fix combined use of whitespace ignore options to diff

2009-01-20T05:21:58Z

The code used to misbehave when options to ignore certain whitespaces (-w -b and --ignore-at-eol) were combined. Signed-off-by: Keith Cascio Signed-off-by: Junio C Hamano

Implement the patience diff algorithm

2009-01-07T21:35:44Z

The patience diff algorithm produces slightly more intuitive output than the classic Myers algorithm, as it does not try to minimize the number of +/- lines first, but tries to preserve the lines that are unique. To this end, it first determines lines that are unique in both files, then the maximal sequence which preserves the order (relative to both files) is extracted. Starting from this initial set of common lines, the rest of the lines is handled recursively, with Myers' algorithm as a fallback when the patience algorithm fails (due to no common unique lines). This patch includes memory leak fixes by Pierre Habouzit. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

diff: add option to show context between close hunks

2008-12-29T09:05:21Z

Merge two hunks if there is only the specified number of otherwise unshown context between them. For --inter-hunk-context=1, the resulting patch has the same number of lines but shows uninterrupted context instead of a context header line in between. Patches generated with this option are easier to read but are also more likely to conflict if the file to be patched contains other changes. This patch keeps the default for this option at 0. It is intended to just make the feature available in order to see its advantages and downsides. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano