Fix up commit-tree/diff-tree user interface issues.

No, this doesn't make them easy to use, but makes diff-tree use
the "-r" flag for "recursive" (not "-R") and makes commit-tree
use AUTHOR_xxx environment flags (not COMMITTER_xxx) to match what
it actually does.

diff --git a/commit-tree.c b/commit-tree.c
index 4fe64ce0b4f99e749a6358dab2c72c36ff98e139..352ded104cb33c1a9f4626cc89017a8c77c7e089 100644 (file)
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -144,9 +144,9 @@ int main(int argc, char **argv)
        time(&now);
        realdate = ctime(&now);
 
-       gecos = getenv("COMMITTER_NAME") ? : realgecos;
-       email = getenv("COMMITTER_EMAIL") ? : realemail;
-       date = getenv("COMMITTER_DATE") ? : realdate;
+       gecos = getenv("AUTHOR_NAME") ? : realgecos;
+       email = getenv("AUTHOR_EMAIL") ? : realemail;
+       date = getenv("AUTHOR_DATE") ? : realdate;
 
        remove_special(gecos); remove_special(realgecos);
        remove_special(email); remove_special(realemail);

diff --git a/diff-tree.c b/diff-tree.c
index 5cf6057f459f8372aaa0beef8a51f74a1a2fedd4..1960c23561d53e3fd0bea2e131c2f72c09566098 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -180,7 +180,7 @@ int main(int argc, char **argv)
                char *arg = argv[1];
                argv++;
                argc--;
-               if (!strcmp(arg, "-R")) {
+               if (!strcmp(arg, "-r")) {
                        recursive = 1;
                        continue;
                }