kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

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

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
maint
Junio C Hamano 2005-04-27 09:21:00 -07:00 committed by Linus Torvalds
parent 3ebfd4aa29
commit f92a446581
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
diff-cache.c
View File

@ -1,13 +1,20 @@
#include "cache.h" #include "cache.h"
#include "diff.h"


static int cached_only = 0; static int cached_only = 0;
static int generate_patch = 0;
static int line_termination = '\n'; static int line_termination = '\n';


/* A file entry went away or appeared */ /* A file entry went away or appeared */
static void show_file(const char *prefix, struct cache_entry *ce) static void show_file(const char *prefix, struct cache_entry *ce)
{ {
printf("%s%o\t%s\t%s\t%s%c", prefix, ntohl(ce->ce_mode), "blob", if (generate_patch)
sha1_to_hex(ce->sha1), ce->name, line_termination); diff_addremove(prefix[0], ntohl(ce->ce_mode),
ce->sha1, ce->name, NULL);
else
printf("%s%06o\tblob\t%s\t%s%c", prefix, ntohl(ce->ce_mode),
sha1_to_hex(ce->sha1), ce->name,
line_termination);
} }


static int show_modified(struct cache_entry *old, struct cache_entry *new) static int show_modified(struct cache_entry *old, struct cache_entry *new)
@ -35,11 +42,15 @@ static int show_modified(struct cache_entry *old, struct cache_entry *new)
if (mode == oldmode && !memcmp(sha1, old->sha1, 20)) if (mode == oldmode && !memcmp(sha1, old->sha1, 20))
return 0; return 0;


strcpy(old_sha1_hex, sha1_to_hex(old->sha1)); if (generate_patch)
printf("*%o->%o\t%s\t%s->%s\t%s%c", oldmode, mode, diff_change(oldmode, mode,
"blob", old->sha1, sha1, old->name, NULL);
old_sha1_hex, sha1_to_hex(sha1), else {
old->name, line_termination); strcpy(old_sha1_hex, sha1_to_hex(old->sha1));
printf("*%06o->%06o\tblob\t%s->%s\t%s%c", oldmode, mode,
old_sha1_hex, sha1_to_hex(sha1),
old->name, line_termination);
}
return 0; return 0;
} }


@ -67,7 +78,10 @@ static int diff_cache(struct cache_entry **ac, int entries)
} }
/* Otherwise we fall through to the "unmerged" case */ /* Otherwise we fall through to the "unmerged" case */
case 3: case 3:
printf("U %s%c", ce->name, line_termination); if (generate_patch)
diff_unmerge(ce->name);
else
printf("U %s%c", ce->name, line_termination);
break; break;


default: default:
@ -102,7 +116,8 @@ static void mark_merge_entries(void)
} }
} }


static char *diff_cache_usage = "diff-cache [-r] [-z] [--cached] <tree sha1>"; static char *diff_cache_usage =
"diff-cache [-r] [-z] [-p] [--cached] <tree sha1>";


int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -119,6 +134,10 @@ int main(int argc, char **argv)
/* We accept the -r flag just to look like diff-tree */ /* We accept the -r flag just to look like diff-tree */
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;