#include "diff.h"
static int cached_only = 0;
-static int generate_patch = 0;
+static int diff_output_format = DIFF_FORMAT_RAW;
+static int diff_line_termination = '\n';
static int match_nonexisting = 0;
-static int line_termination = '\n';
static int detect_rename = 0;
-static int reverse_diff = 0;
+static int find_copies_harder = 0;
+static int diff_setup_opt = 0;
static int diff_score_opt = 0;
+static const char *pickaxe = NULL;
+static int pickaxe_opts = 0;
+static int diff_break_opt = -1;
+static const char *orderfile = NULL;
+static const char *diff_filter = 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)
}
oldmode = old->ce_mode;
- if (mode == oldmode && !memcmp(sha1, old->sha1, 20))
+ if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
+ !find_copies_harder)
return 0;
mode = ntohl(mode);
return 0;
}
-static int diff_cache(struct cache_entry **ac, int entries)
+static int diff_cache(struct cache_entry **ac, int entries, const char **pathspec)
{
while (entries) {
struct cache_entry *ce = *ac;
int same = (entries > 1) && ce_same_name(ce, ac[1]);
+ if (!ce_path_match(ce, pathspec))
+ goto skip_entry;
+
switch (ce_stage(ce)) {
case 0:
/* No stage 1 entry? That means it's a new file */
die("impossible cache entry stage");
}
+skip_entry:
/*
* Ignore all the different stages for this file,
* we've handled the relevant cases now.
}
}
-static char *diff_cache_usage =
-"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [--cached] <tree-ish>";
+static const char diff_cache_usage[] =
+"git-diff-cache [-m] [--cached] "
+"[<common diff options>] <tree-ish> [<path>...]"
+COMMON_DIFF_OPTIONS_HELP;
int main(int argc, char **argv)
{
- unsigned char tree_sha1[20];
+ const char *tree_name = NULL;
+ unsigned char sha1[20];
+ const char *prefix = setup_git_directory();
+ const char **pathspec = NULL;
void *tree;
unsigned long size;
int ret;
+ int allow_options = 1;
+ int i;
- read_cache();
- while (argc > 2) {
- char *arg = argv[1];
- argv++;
- argc--;
+ for (i = 1; i < argc; i++) {
+ const char *arg = argv[i];
+
+ if (!allow_options || *arg != '-') {
+ if (tree_name)
+ break;
+ tree_name = arg;
+ continue;
+ }
+
+ if (!strcmp(arg, "--")) {
+ allow_options = 0;
+ continue;
+ }
if (!strcmp(arg, "-r")) {
/* We accept the -r flag just to look like git-diff-tree */
continue;
}
- if (!strcmp(arg, "-p")) {
- generate_patch = 1;
+ /* We accept the -u flag as a synonym for "-p" */
+ if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) {
+ diff_output_format = DIFF_FORMAT_PATCH;
+ continue;
+ }
+ if (!strncmp(arg, "-B", 2)) {
+ if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
+ usage(diff_cache_usage);
continue;
}
if (!strncmp(arg, "-M", 2)) {
- generate_patch = detect_rename = 1;
- diff_score_opt = diff_scoreopt_parse(arg);
+ detect_rename = DIFF_DETECT_RENAME;
+ if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+ usage(diff_cache_usage);
continue;
}
if (!strncmp(arg, "-C", 2)) {
- generate_patch = 1;
- detect_rename = 2;
- diff_score_opt = diff_scoreopt_parse(arg);
+ detect_rename = DIFF_DETECT_COPY;
+ if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+ usage(diff_cache_usage);
+ continue;
+ }
+ if (!strcmp(arg, "--find-copies-harder")) {
+ find_copies_harder = 1;
continue;
}
if (!strcmp(arg, "-z")) {
- line_termination = '\0';
+ diff_line_termination = 0;
+ continue;
+ }
+ if (!strcmp(arg, "--name-only")) {
+ diff_output_format = DIFF_FORMAT_NAME;
continue;
}
if (!strcmp(arg, "-R")) {
- reverse_diff = 1;
+ diff_setup_opt |= DIFF_SETUP_REVERSE;
+ continue;
+ }
+ if (!strncmp(arg, "-S", 2)) {
+ pickaxe = arg + 2;
+ continue;
+ }
+ if (!strncmp(arg, "--diff-filter=", 14)) {
+ diff_filter = arg + 14;
+ continue;
+ }
+ if (!strncmp(arg, "-O", 2)) {
+ orderfile = arg + 2;
+ continue;
+ }
+ if (!strcmp(arg, "--pickaxe-all")) {
+ pickaxe_opts = DIFF_PICKAXE_ALL;
continue;
}
if (!strcmp(arg, "-m")) {
usage(diff_cache_usage);
}
- if (argc != 2 || get_sha1(argv[1], tree_sha1))
+ pathspec = get_pathspec(prefix, argv + i);
+
+ if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
usage(diff_cache_usage);
- diff_setup(detect_rename, diff_score_opt, reverse_diff,
- (generate_patch ? -1 : line_termination),
- NULL, 0);
+ if (!tree_name || get_sha1(tree_name, sha1))
+ usage(diff_cache_usage);
+
+ read_cache();
+
+ /* The rest is for paths restriction. */
+ diff_setup(diff_setup_opt);
mark_merge_entries();
- tree = read_object_with_reference(tree_sha1, "tree", &size, NULL);
+ tree = read_object_with_reference(sha1, "tree", &size, NULL);
if (!tree)
- die("bad tree object %s", argv[1]);
- if (read_tree(tree, size, 1))
- die("unable to read tree object %s", argv[1]);
+ die("bad tree object %s", tree_name);
+ if (read_tree(tree, size, 1, pathspec))
+ die("unable to read tree object %s", tree_name);
+
+ ret = diff_cache(active_cache, active_nr, pathspec);
- ret = diff_cache(active_cache, active_nr);
- diff_flush();
+ diffcore_std(pathspec,
+ detect_rename, diff_score_opt,
+ pickaxe, pickaxe_opts,
+ diff_break_opt,
+ orderfile, diff_filter);
+ diff_flush(diff_output_format, diff_line_termination);
return ret;
}