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

diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 975777f05ed69ef78f1fd91ac512f5b92a384141..a2913c2a2cd1ec158157ada3e2deb666892b734b 100755 (executable)
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -7,37 +7,10 @@ struct cmdname_help
     char help[80];
 };
 
-struct cmdname_help common_cmds[] = {"
+static struct cmdname_help common_cmds[] = {"
 
-sort <<\EOF |
-add
-apply
-archive
-bisect
-branch
-checkout
-cherry-pick
-clone
-commit
-diff
-fetch
-grep
-init
-log
-merge
-mv
-prune
-pull
-push
-rebase
-reset
-revert
-rm
-show
-show-branch
-status
-tag
-EOF
+sed -n -e 's/^git-\([^         ]*\)[   ].* common.*/\1/p' command-list.txt |
+sort |
 while read cmd
 do
      sed -n '