X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff.c;h=71742aa10b3b8e2621eecd4be929946b0a308deb;hb=8dd84b0169864f638516b82df40b0a3ef6e2cb92;hp=b6114ce948bfcb68018fb9799bb26836957bb9c2;hpb=f5196dbb25febb15b41ef0e6569aaa1654b8533e;p=git.git

diff --git a/builtin-diff.c b/builtin-diff.c
index b6114ce94..71742aa10 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -84,8 +84,7 @@ static void stuff_change(struct diff_options *opt,
 
 	if (opt->reverse_diff) {
 		unsigned tmp;
-		const
-			const unsigned char *tmp_u;
+		const unsigned char *tmp_u;
 		const char *tmp_c;
 		tmp = old_mode; old_mode = new_mode; new_mode = tmp;
 		tmp_u = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_u;
@@ -232,7 +231,7 @@ static int builtin_diff_combined(struct rev_info *revs,
 	return 0;
 }
 
-static void add_head(struct rev_info *revs)
+void add_head(struct rev_info *revs)
 {
 	unsigned char sha1[20];
 	struct object *obj;
@@ -271,7 +270,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
 	 *
 	 * Other cases are errors.
 	 */
-	
+
 	git_config(git_diff_config);
 	init_revisions(&rev);
 	rev.diffopt.output_format = DIFF_FORMAT_PATCH;
@@ -321,7 +320,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
 			blob[blobs].name = name;
 			blobs++;
 			continue;
-			
+
 		}
 		die("unhandled object '%s' given.", name);
 	}