Oops, sorry I screwed up and sent a wrong patch.  Please discard
the previous one.

The show-diff command uses a variable "new" but it is always
used to point at the original data recorded in the dircache
before the user started editing in the working file.  Rename it
to "old" to avoid confusion.

To be applied on top of my previous patches:

    [PATCH] Optionally tell show-diff to show only named files.
    [PATCH] show-diff -z option for machine readable output.
    [PATCH] show-diff shell safety.

Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>

 show-diff.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

show-diff.c: e52eee21c2f682bef2dba06445699cca8e34c63a
--- show-diff.c
+++ show-diff.c 2005-04-16 18:23:57.000000000 -0700
@@ -162,7 +162,7 @@
                int changed;
                unsigned long size;
                char type[20];
-               void *new;
+               void *old;
                if (1 <argc &&
                    ! matches_pathspec(ce, argv+1, argc-1))
@@ -193,9 +193,9 @@
                if (silent)
-               new = read_sha1_file(ce->sha1, type, &size);
-               show_differences(ce->name, new, size);
-               free(new);
+               old = read_sha1_file(ce->sha1, type, &size);
+               show_differences(ce->name, old, size);
+               free(old);
        return 0;

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to