From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 11 Apr 2005 15:37:17 +0000 (-0700)
Subject: Fix up commit-tree/diff-tree user interface issues.
X-Git-Tag: v0.99~921
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=bf16c71e2f9fc9ca44273f7f4637dce194a49cce;p=git.git

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 4fe64ce0..352ded10 100644
--- 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 5cf6057f..1960c235 100644
--- 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;
 		}