mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] show-diff.c: adjust default format for the Linux kernel.

Browse Source 
This patch adjusts the default output format of show-diff to match
the Linux kernel style, recommended in Documentation/SubmittingPatches.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano
2005-04-18 15:07:24 -07:00
committed by Linus Torvalds
parent 8f3671dcd9
commit 5a6ad74623
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
show-diff.c
View File

@ -5,7 +5,7 @@
*/ */
#include "cache.h" #include "cache.h"
static char *diff_cmd = "diff -L '%s' -u -N - '%s'"; static char *diff_cmd = "diff -L 'a/%s' -L 'b/%s' -p -u - '%s'";
/* Help to copy the thing properly quoted for the shell safety. /* Help to copy the thing properly quoted for the shell safety.
* any single quote is replaced with '\'', and the caller is * any single quote is replaced with '\'', and the caller is
@ -52,11 +52,12 @@ static void show_differences(char *name, char *label, void *old_contents,
FILE *f; FILE *f;
char *name_sq = sq_expand(name); char *name_sq = sq_expand(name);
char *label_sq = (name != label) ? sq_expand(label) : name_sq; char *label_sq = (name != label) ? sq_expand(label) : name_sq;
int cmd_size = strlen(name_sq) + strlen(label_sq) + strlen(diff_cmd); int cmd_size = strlen(name_sq) +
strlen(label_sq) * 2 + strlen(diff_cmd);
char *cmd = malloc(cmd_size); char *cmd = malloc(cmd_size);
fflush(stdout); fflush(stdout);
snprintf(cmd, cmd_size, diff_cmd, label_sq, name_sq); snprintf(cmd, cmd_size, diff_cmd, label_sq, label_sq, name_sq);
f = popen(cmd, "w"); f = popen(cmd, "w");
if (old_size) if (old_size)
fwrite(old_contents, old_size, 1, f); fwrite(old_contents, old_size, 1, f);