[git commit] diff: fix -B with single line changes

Denys Vlasenko vda.linux at googlemail.com
Fri Jul 31 14:50:49 UTC 2015


commit: http://git.busybox.net/busybox/commit/?id=a47fccaa63449182a5d0c11cf03139a072f8c19c
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Fix -B with single line changes. They were always ignored regardless
if they were blank or not.

Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 editors/diff.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/editors/diff.c b/editors/diff.c
index cf14b1d..e0adcee 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -658,8 +658,8 @@ static bool diff(FILE* fp[2], char *file[2])
 				}
 
 				for (j = 0; j < 2; j++)
-					for (k = v[j].a; k < v[j].b; k++)
-						nonempty |= (ix[j][k+1] - ix[j][k] != 1);
+					for (k = v[j].a; k <= v[j].b; k++)
+						nonempty |= (ix[j][k] - ix[j][k - 1] != 1);
 
 				vec = xrealloc_vector(vec, 6, ++idx);
 				memcpy(vec[idx], v, sizeof(v));


More information about the busybox-cvs mailing list