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

diff --git a/builtin-annotate.c b/builtin-annotate.c
index 25ad473711379d6f696a43020e065f9706da9841..fc43eed36b55e4966796490b8c0a02fae790229c 100644 (file)
--- a/builtin-annotate.c
+++ b/builtin-annotate.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2006 Ryan Anderson
  */
 #include "git-compat-util.h"
-#include "exec_cmd.h"
+#include "builtin.h"
 
 int cmd_annotate(int argc, const char **argv, const char *prefix)
 {
@@ -12,7 +12,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix)
        int i;
        nargv = xmalloc(sizeof(char *) * (argc + 2));
 
-       nargv[0] = "blame";
+       nargv[0] = "annotate";
        nargv[1] = "-c";
 
        for (i = 1; i < argc; i++) {
@@ -20,6 +20,5 @@ int cmd_annotate(int argc, const char **argv, const char *prefix)
        }
        nargv[argc + 1] = NULL;
 
-       return execv_git_cmd(nargv);
+       return cmd_blame(argc + 1, nargv, prefix);
 }
-