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

diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 17df47b95067449f03039b8ecd7715701302fa68..a2913c2a2cd1ec158157ada3e2deb666892b734b 100755 (executable)
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -9,35 +9,8 @@ struct cmdname_help
 
 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 '