This allows you to do
git diff --no-index file1.old file1.new file2.old file2.new...
It could be seen as an abuse of "git --no-index", but it's very
tempting considering many bells and whistles git's diff machinery
provides.
Signed-off-by: A Clearcase user who has had enough with "ct diff"
---
Sorry I used git@vger as a personal archive, but this might benefit
others as well, I think.
diff-no-index.c | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/diff-no-index.c b/diff-no-index.c
index 3a36144..b4f6d06 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -199,12 +199,8 @@ void diff_no_index(struct rev_info *revs,
!path_outside_repo(argv[i+1])))
return;
}
- if (argc != i + 2)
- usagef("git diff %s <path> <path>",
- no_index ? "--no-index" : "[--no-index]");
-
diff_setup(&revs->diffopt);
- for (i = 1; i < argc - 2; ) {
+ for (i = 1; i < argc; ) {
int j;
if (!strcmp(argv[i], "--no-index"))
i++;
@@ -214,13 +210,19 @@ void diff_no_index(struct rev_info *revs,
}
else if (!strcmp(argv[i], "--"))
i++;
- else {
+ else if (argv[i][0] == '-') {
j = diff_opt_parse(&revs->diffopt, argv + i, argc - i);
if (!j)
die("invalid diff option/value: %s", argv[i]);
i += j;
}
+ else
+ break;
}
+ if ((argc - i) % 2)
+ usagef("git diff %s <path> <path>%s",
+ no_index ? "--no-index" : "[--no-index]",
+ no_index ? "[ <path> <path>...]" : "");
/*
* If the user asked for our exit code then don't start a
@@ -229,13 +231,15 @@ void diff_no_index(struct rev_info *revs,
if (!DIFF_OPT_TST(&revs->diffopt, EXIT_WITH_STATUS))
setup_pager();
+ /* argv now only contains paths */
+ argv += i;
+ argc -= i;
+
if (prefix) {
int len = strlen(prefix);
- const char *paths[3];
- memset(paths, 0, sizeof(paths));
- for (i = 0; i < 2; i++) {
- const char *p = argv[argc - 2 + i];
+ for (i = 0; i < argc; i++) {
+ const char *p = argv[i];
/*
* stdin should be spelled as '-'; if you have
* path that is '-', spell it as ./-.
@@ -243,12 +247,10 @@ void diff_no_index(struct rev_info *revs,
p = (strcmp(p, "-")
? xstrdup(prefix_filename(prefix, len, p))
: p);
- paths[i] = p;
+ argv[i] = p;
}
- diff_tree_setup_paths(paths, &revs->diffopt);
}
- else
- diff_tree_setup_paths(argv + argc - 2, &revs->diffopt);
+
revs->diffopt.skip_stat_unmatch = 1;
if (!revs->diffopt.output_format)
revs->diffopt.output_format = DIFF_FORMAT_PATCH;
@@ -260,9 +262,11 @@ void diff_no_index(struct rev_info *revs,
if (diff_setup_done(&revs->diffopt) < 0)
die("diff_setup_done failed");
- if (queue_diff(&revs->diffopt, revs->diffopt.pathspec.raw[0],
- revs->diffopt.pathspec.raw[1]))
- exit(1);
+ while (argv[0] && argv[1]) {
+ if (queue_diff(&revs->diffopt, argv[0], argv[1]))
+ exit(1);
+ argv += 2;
+ }
diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);
--
1.7.3.1.256.g2539c.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html