Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
> With this flag and given two paths, git-diff-files behaves as a GNU diff
> lookalike (plus the git goodies like --check, colour, etc.). This flag
> is also available in git-diff. It also works outside of a git repository.
>
> In addition, if git-diff{,-files} is called without revision or stage
> parameter, and with exactly two paths at least one of which is not tracked,
> the default is --no-index.
>
> So, you can now say
>
> git diff /etc/inittab /etc/fstab
>
> and it actually works!
Modulo double slashes X-<.
$ diff --git a//etc/inittab b//etc/fstab
index 04eabd6..7314c1a 100644
--- a//etc/inittab
+++ b//etc/fstab
@@ -1,69 +1,13 @@
...
This problem is not new; this should fix it.
-- >8 --
diff-patch: Avoid emitting double-slashes in textual patch.
Signed-off-by: Junio C Hamano <junkio@xxxxxxx>
---
diff --git a/diff.c b/diff.c
index 5ecb122..84937cb 100644
--- a/diff.c
+++ b/diff.c
@@ -219,6 +219,9 @@ static void emit_rewrite_diff(const char *name_a,
const char *new = diff_get_color(color_diff, DIFF_FILE_NEW);
const char *reset = diff_get_color(color_diff, DIFF_RESET);
+ name_a += (*name_a == '/');
+ name_b += (*name_b == '/');
+
name_a_tab = strchr(name_a, ' ') ? "\t" : "";
name_b_tab = strchr(name_b, ' ') ? "\t" : "";
@@ -1064,8 +1067,8 @@ static void builtin_diff(const char *name_a,
const char *set = diff_get_color(o->color_diff, DIFF_METAINFO);
const char *reset = diff_get_color(o->color_diff, DIFF_RESET);
- a_one = quote_two("a/", name_a);
- b_two = quote_two("b/", name_b);
+ a_one = quote_two("a/", name_a + (*name_a == '/'));
+ b_two = quote_two("b/", name_b + (*name_b == '/'));
lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
printf("%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
-
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