diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-04-18 15:07:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 15:07:24 -0700 |
| commit | 5a6ad74623571a1479af7914ec16783a9566e4b2 (patch) | |
| tree | 1ef36590fde7db5897b06a9edfe9f7280bc37c0e /show-diff.c | |
| parent | 8f3671dcd93b8c5ab21582752f736646c66e2249 (diff) | |
| download | git-5a6ad74623571a1479af7914ec16783a9566e4b2.tar.gz | |
[PATCH] show-diff.c: adjust default format for the Linux kernel.
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>
Diffstat (limited to 'show-diff.c')
| -rw-r--r-- | show-diff.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/show-diff.c b/show-diff.c index 40bc187bdc..32d2fceaff 100644 --- a/show-diff.c +++ b/show-diff.c @@ -5,7 +5,7 @@ */ #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. * 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; char *name_sq = sq_expand(name); 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); 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"); if (old_size) fwrite(old_contents, old_size, 1, f); |