undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Add -p (patch) to diff-tree.

Browse Source 
This uses the reworked diff interface to generate patches directly out
of diff-tree when -p is specified. 

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-27 09:21:00 -07:00 committed by Linus Torvalds
parent 4a6bf9e18a
commit 3ebfd4aa29
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
diff-tree.c
View File

@ -1,7 +1,9 @@
#include "cache.h" #include "cache.h"
#include "diff.h"
static int recursive = 0; static int recursive = 0;
static int line_termination = '\n'; static int line_termination = '\n';
static int generate_patch = 0;
// What paths are we interested in? // What paths are we interested in?
static int nr_paths = 0; static int nr_paths = 0;
@ -79,10 +81,15 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
return; return;
} }
printf("%s%o\t%s\t%s\t%s%s%c", prefix, mode, if (generate_patch) {
S_ISDIR(mode) ? "tree" : "blob", if (!S_ISDIR(mode))
sha1_to_hex(sha1), base, path, diff_addremove(prefix[0], mode, sha1, base, path);
line_termination); }
else
printf("%s%06o\t%s\t%s\t%s%s%c", prefix, mode,
S_ISDIR(mode) ? "tree" : "blob",
sha1_to_hex(sha1), base, path,
line_termination);
} }
static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base) static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
@ -128,11 +135,17 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
return retval; return retval;
} }
strcpy(old_sha1_hex, sha1_to_hex(sha1)); if (generate_patch) {
printf("*%o->%o\t%s\t%s->%s\t%s%s%c", mode1, mode2, if (!S_ISDIR(mode1))
S_ISDIR(mode1) ? "tree" : "blob", diff_change(mode1, mode2, sha1, sha2, base, path1);
old_sha1_hex, sha1_to_hex(sha2), base, path1, }
line_termination); else {
strcpy(old_sha1_hex, sha1_to_hex(sha1));
printf("*%06o->%06o\t%s\t%s->%s\t%s%s%c", mode1, mode2,
S_ISDIR(mode1) ? "tree" : "blob",
old_sha1_hex, sha1_to_hex(sha2), base, path1,
line_termination);
}
return 0; return 0;
} }
@ -255,6 +268,10 @@ int main(int argc, char **argv)
recursive = 1; recursive = 1;
continue; continue;
} }
if (!strcmp(arg, "-p")) {
generate_patch = 1;
continue;
}
if (!strcmp(arg, "-z")) { if (!strcmp(arg, "-z")) {
line_termination = '\0'; line_termination = '\0';
continue; continue;