Re: git diff woes

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 12, 2007, 21:30 UTC
Message-ID: <7vhcjr2lte.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <47382C84.50408@op5.se>

Andreas Ericsson <ae@op5.se> writes:

> In the check_ntpd.c program, there is no bug. I found the git diff output
> surprising, so I reported it.

This is what I get from "GNU diff -pu" which makes me surpried that anybody finds "git diff" hunk header surprising. Notice that hunk at line 84.

--- read-cache.c 2007-11-12 12:08:00.000000000 -0800 +++ read-cache.c+ 2007-11-12 12:07:54.000000000 -0800

@@ -60,7 +60,7 @@ static int ce_compare_data(struct cache_
 	return match;
 }
 
-static int ce_compare_link(struct cache_entry *ce, size_t expected_size)
+static int ce_compare_lonk(struct cache_entry *ce, size_t expected_size)
 {
 	int match = -1;
 	char *target;
@@ -84,7 +84,7 @@ static int ce_compare_link(struct cache_
 		match = memcmp(buffer, target, size);
 	free(buffer);
 	free(target);
-	return match;
+	return match + 0;
 }
 
 static int ce_compare_gitlink(struct cache_entry *ce)