[PATCH 3/6] Add -p (patch) to diff-tree.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:41:54
This patch uses the reworked diff interface to generate patches
directly out of diff-tree when -p is specified.
Signed-off-by: Junio C Hamano <redacted>
---
diff-tree.c | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
To be tested with the following:
GIT_INDEX_FILE=junk
export GIT_INDEX_FILE
rm -f junk
date >trash ; update-cache --add trash
t1=$(write-tree)
date >>trash; update-cache trash
t2=$(write-tree)
GIT_EXTERNAL_DIFF=echo ./diff-tree -p $t1 $t2
--- k/diff-tree.c
+++ l/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 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 *tree 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;