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

diff --git a/builtin-send-pack.c b/builtin-send-pack.c
index b0cfae83fc4dcdd8f58e29b87fd8aa4b6af0f6c0..930e0fb3fdfee2293d0fca650d7139f09f2d381e 100644 (file)
--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@ -264,9 +264,7 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str
 
 static const char *status_abbrev(unsigned char sha1[20])
 {
-       const char *abbrev;
-       abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
-       return abbrev ? abbrev : sha1_to_hex(sha1);
+       return find_unique_abbrev(sha1, DEFAULT_ABBREV);
 }
 
 static void print_ok_ref_status(struct ref *ref)