login
Header Space

 
 

Re: git diff woes

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Andreas Ericsson <ae@...>
Cc: Johannes Schindelin <Johannes.Schindelin@...>, Git Mailing List <git@...>
Date: Monday, November 12, 2007 - 5:30 pm

Andreas Ericsson <ae@op5.se> writes:


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)
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
git diff woes, Andreas Ericsson, (Mon Nov 12, 5:44 am)
Re: git diff woes, Johannes Schindelin, (Mon Nov 12, 6:01 am)
Re: git diff woes, Andreas Ericsson, (Mon Nov 12, 6:35 am)
Re: git diff woes, Junio C Hamano, (Mon Nov 12, 5:30 pm)
Re: git diff woes, Andreas Ericsson, (Mon Nov 12, 8:03 pm)
Re: git diff woes, Miles Bader, (Mon Nov 12, 10:53 pm)
Re: git diff woes, Andreas Ericsson, (Tue Nov 13, 3:40 am)
[PATCH] diffcore: Allow users to decide what funcname to use, Andreas Ericsson, (Tue Nov 13, 5:15 am)
Re: git diff woes, Johannes Schindelin, (Mon Nov 12, 8:59 pm)
Re: git diff woes, Johannes Schindelin, (Mon Nov 12, 6:50 am)
Re: git diff woes, Andreas Ericsson, (Mon Nov 12, 7:19 am)
speck-geostationary