summaryrefslogtreecommitdiff
path: root/xdiff/xdiffi.h
diff options
context:
space:
mode:
authorAntoine Pelisse <apelisse@gmail.com>2013-06-19 18:46:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-19 22:17:45 (GMT)
commit36617af7ed594d1928554356d809bd611c642dd2 (patch)
tree56b4026e10b9c562006a1bf3cf38633b8c21d663 /xdiff/xdiffi.h
parentedca4152560522a431a51fc0a06147fc680b5b18 (diff)
downloadgit-36617af7ed594d1928554356d809bd611c642dd2.zip
git-36617af7ed594d1928554356d809bd611c642dd2.tar.gz
git-36617af7ed594d1928554356d809bd611c642dd2.tar.bz2
diff: add --ignore-blank-lines option
The goal of the patch is to introduce the GNU diff -B/--ignore-blank-lines as closely as possible. The short option is not available because it's already used for "break-rewrites". When this option is used, git-diff will not create hunks that simply add or remove empty lines, but will still show empty lines addition/suppression if they are close enough to "valuable" changes. There are two differences between this option and GNU diff -B option: - GNU diff doesn't have "--inter-hunk-context", so this must be handled - The following sequence looks like a bug (context is displayed twice): $ seq 5 >file1 $ cat <<EOF >file2 change 1 2 3 4 5 change EOF $ diff -u -B file1 file2 --- file1 2013-06-08 22:13:04.471517834 +0200 +++ file2 2013-06-08 22:13:23.275517855 +0200 @@ -1,5 +1,7 @@ +change 1 2 + 3 4 5 @@ -3,3 +5,4 @@ 3 4 5 +change So here is a more thorough description of the option: - real changes are interesting - blank lines that are close enough (less than context size) to interesting changes are considered interesting (recursive definition) - "context" lines are used around each hunk of interesting changes - If two hunks are separated by less than "inter-hunk-context", they will be merged into one. The implementation does the "interesting changes selection" in a single pass. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xdiffi.h')
-rw-r--r--xdiff/xdiffi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/xdiff/xdiffi.h b/xdiff/xdiffi.h
index 7a92ea9..8b81206 100644
--- a/xdiff/xdiffi.h
+++ b/xdiff/xdiffi.h
@@ -41,6 +41,7 @@ typedef struct s_xdchange {
struct s_xdchange *next;
long i1, i2;
long chg1, chg2;
+ int ignore;
} xdchange_t;