summaryrefslogtreecommitdiff
path: root/diff-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-04-27 16:21:00 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-27 16:21:00 (GMT)
commit3ebfd4aa29e30187ad7a3f75fa2d2971878468e7 (patch)
tree697e162bf0df0ca4f6d10f6ca3983bfa2288fd43 /diff-tree.c
parent4a6bf9e18a96eaa14c5cc0074d2b2ea75f6206ff (diff)
downloadgit-3ebfd4aa29e30187ad7a3f75fa2d2971878468e7.zip
git-3ebfd4aa29e30187ad7a3f75fa2d2971878468e7.tar.gz
git-3ebfd4aa29e30187ad7a3f75fa2d2971878468e7.tar.bz2
[PATCH] Add -p (patch) to diff-tree.
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>
Diffstat (limited to 'diff-tree.c')
-rw-r--r--diff-tree.c35
1 files changed, 26 insertions, 9 deletions
diff --git a/diff-tree.c b/diff-tree.c
index 3579b5f..cbea28d 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -1,7 +1,9 @@
#include "cache.h"
+#include "diff.h"
static int recursive = 0;
static int line_termination = '\n';
+static int generate_patch = 0;
// What paths are we interested in?
static int nr_paths = 0;
@@ -79,10 +81,15 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
return;
}
- printf("%s%o\t%s\t%s\t%s%s%c", prefix, mode,
- S_ISDIR(mode) ? "tree" : "blob",
- sha1_to_hex(sha1), base, path,
- line_termination);
+ if (generate_patch) {
+ if (!S_ISDIR(mode))
+ diff_addremove(prefix[0], mode, sha1, base, path);
+ }
+ 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)
@@ -128,11 +135,17 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
return retval;
}
- strcpy(old_sha1_hex, sha1_to_hex(sha1));
- printf("*%o->%o\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);
+ if (generate_patch) {
+ if (!S_ISDIR(mode1))
+ diff_change(mode1, mode2, sha1, sha2, base, path1);
+ }
+ 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;
}
@@ -255,6 +268,10 @@ int main(int argc, char **argv)
recursive = 1;
continue;
}
+ if (!strcmp(arg, "-p")) {
+ generate_patch = 1;
+ continue;
+ }
if (!strcmp(arg, "-z")) {
line_termination = '\0';
continue;