aboutsummaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-08 14:21:35 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-08 14:21:35 -0700
commita52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5d (patch)
treee095fccfca6cd9d67981a5672f7f7df5629ad9cf /xdiff
parent71076e11cda645c08f5c9f269e02ed28e47d5c4a (diff)
parent044fb190f75cdec35e56bde30ec214ab144311d9 (diff)
downloadgit-a52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5d.tar.gz
git-a52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5d.tar.xz
Merge branch 'js/ignore-space-at-eol' into maint
An age old bug that caused "git diff --ignore-space-at-eol" misbehave has been fixed. * js/ignore-space-at-eol: diff: fix a double off-by-one with --ignore-space-at-eol diff: demonstrate a bug with --patience and --ignore-space-at-eol
Diffstat (limited to 'xdiff')
-rw-r--r--xdiff/xpatience.c2
-rw-r--r--xdiff/xutils.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
index 04e1a1ab2..a613efc70 100644
--- a/xdiff/xpatience.c
+++ b/xdiff/xpatience.c
@@ -1,6 +1,6 @@
/*
* LibXDiff by Davide Libenzi ( File Differential Library )
- * Copyright (C) 2003-2009 Davide Libenzi, Johannes E. Schindelin
+ * Copyright (C) 2003-2016 Davide Libenzi, Johannes E. Schindelin
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 62cb23dfd..027192a1c 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -200,8 +200,10 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
return 0;
}
} else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL) {
- while (i1 < s1 && i2 < s2 && l1[i1++] == l2[i2++])
- ; /* keep going */
+ while (i1 < s1 && i2 < s2 && l1[i1] == l2[i2]) {
+ i1++;
+ i2++;
+ }
}
/*