git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/walker.c b/walker.c
index 397b80de9e949ea7d70c723f7a58c9ffdaf0a168..c10eca88261eed6b0e5c3fc2fdc19b8332c4ac6b 100644 (file)
--- a/walker.c
+++ b/walker.c
@@ -256,7 +256,6 @@ int walker_fetch(struct walker *walker, int targets, char **target,
        int i;
 
        save_commit_buffer = 0;
-       track_object_refs = 0;
 
        for (i = 0; i < targets; i++) {
                if (!write_ref || !write_ref[i])
@@ -274,7 +273,7 @@ int walker_fetch(struct walker *walker, int targets, char **target,
 
        for (i = 0; i < targets; i++) {
                if (interpret_target(walker, target[i], &sha1[20 * i])) {
-                       error("Could not interpret %s as something to pull", target[i]);
+                       error("Could not interpret response from server '%s' as something to pull", target[i]);
                        goto unlock_and_fail;
                }
                if (process(walker, lookup_unknown_object(&sha1[20 * i])))