projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-apply: if no input files specified, apply stdin
[git.git]
/
diff-cache.c
diff --git
a/diff-cache.c
b/diff-cache.c
index
ff310ab
..
10d5c95
100644
(file)
--- a/
diff-cache.c
+++ b/
diff-cache.c
@@
-2,12
+2,12
@@
#include "diff.h"
static int cached_only = 0;
#include "diff.h"
static int cached_only = 0;
-static int
generate_patch = 0
;
+static int
diff_output_format = DIFF_FORMAT_HUMAN
;
static int match_nonexisting = 0;
static int match_nonexisting = 0;
-static int line_termination = '\n';
static int detect_rename = 0;
static int reverse_diff = 0;
static int diff_score_opt = 0;
static int detect_rename = 0;
static int reverse_diff = 0;
static int diff_score_opt = 0;
+static const char *pickaxe = NULL;
/* A file entry went away or appeared */
static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
/* A file entry went away or appeared */
static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
@@
-70,7
+70,8
@@
static int show_modified(struct cache_entry *old,
}
oldmode = old->ce_mode;
}
oldmode = old->ce_mode;
- if (mode == oldmode && !memcmp(sha1, old->sha1, 20))
+ if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
+ detect_rename < DIFF_DETECT_COPY)
return 0;
mode = ntohl(mode);
return 0;
mode = ntohl(mode);
@@
-153,9
+154,9
@@
static void mark_merge_entries(void)
}
static char *diff_cache_usage =
}
static char *diff_cache_usage =
-"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-
R
] [--cached] <tree-ish>";
+"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-
C] [-R] [-S<string>
] [--cached] <tree-ish>";
-int main(int argc, char **argv)
+int main(int argc, c
onst c
har **argv)
{
unsigned char tree_sha1[20];
void *tree;
{
unsigned char tree_sha1[20];
void *tree;
@@
-164,7
+165,7
@@
int main(int argc, char **argv)
read_cache();
while (argc > 2) {
read_cache();
while (argc > 2) {
- char *arg = argv[1];
+ c
onst c
har *arg = argv[1];
argv++;
argc--;
if (!strcmp(arg, "-r")) {
argv++;
argc--;
if (!strcmp(arg, "-r")) {
@@
-172,22
+173,31
@@
int main(int argc, char **argv)
continue;
}
if (!strcmp(arg, "-p")) {
continue;
}
if (!strcmp(arg, "-p")) {
-
generate_patch = 1
;
+
diff_output_format = DIFF_FORMAT_PATCH
;
continue;
}
if (!strncmp(arg, "-M", 2)) {
continue;
}
if (!strncmp(arg, "-M", 2)) {
- generate_patch = detect_rename = 1;
+ detect_rename = DIFF_DETECT_RENAME;
+ diff_score_opt = diff_scoreopt_parse(arg);
+ continue;
+ }
+ if (!strncmp(arg, "-C", 2)) {
+ detect_rename = DIFF_DETECT_COPY;
diff_score_opt = diff_scoreopt_parse(arg);
continue;
}
if (!strcmp(arg, "-z")) {
diff_score_opt = diff_scoreopt_parse(arg);
continue;
}
if (!strcmp(arg, "-z")) {
-
line_termination = '\0'
;
+
diff_output_format = DIFF_FORMAT_MACHINE
;
continue;
}
if (!strcmp(arg, "-R")) {
reverse_diff = 1;
continue;
}
continue;
}
if (!strcmp(arg, "-R")) {
reverse_diff = 1;
continue;
}
+ if (!strcmp(arg, "-S")) {
+ pickaxe = arg + 2;
+ continue;
+ }
if (!strcmp(arg, "-m")) {
match_nonexisting = 1;
continue;
if (!strcmp(arg, "-m")) {
match_nonexisting = 1;
continue;
@@
-199,12
+209,14
@@
int main(int argc, char **argv)
usage(diff_cache_usage);
}
usage(diff_cache_usage);
}
- if (argc
!=
2 || get_sha1(argv[1], tree_sha1))
+ if (argc
<
2 || get_sha1(argv[1], tree_sha1))
usage(diff_cache_usage);
usage(diff_cache_usage);
+ argv++;
+ argc--;
+
+ /* The rest is for paths restriction. */
- diff_setup(detect_rename, diff_score_opt, reverse_diff,
- (generate_patch ? -1 : line_termination),
- NULL, 0);
+ diff_setup(reverse_diff);
mark_merge_entries();
mark_merge_entries();
@@
-215,6
+227,13
@@
int main(int argc, char **argv)
die("unable to read tree object %s", argv[1]);
ret = diff_cache(active_cache, active_nr);
die("unable to read tree object %s", argv[1]);
ret = diff_cache(active_cache, active_nr);
- diff_flush();
+ if (detect_rename)
+ diffcore_rename(detect_rename, diff_score_opt);
+ diffcore_prune();
+ if (pickaxe)
+ diffcore_pickaxe(pickaxe);
+ if (2 <= argc)
+ diffcore_pathspec(argv + 1);
+ diff_flush(diff_output_format, 1);
return ret;
}
return ret;
}