diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-11 08:37:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-11 08:37:17 -0700 |
| commit | bf16c71e2f9fc9ca44273f7f4637dce194a49cce (patch) | |
| tree | cc4cf7c0e5833fdfc4999d33d5b652afa4858bb9 | |
| parent | 91af81a98ea5c5594c67a63abc933250e05c13c6 (diff) | |
| download | git-bf16c71e2f9fc9ca44273f7f4637dce194a49cce.tar.gz | |
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.
| -rw-r--r-- | commit-tree.c | 6 | ||||
| -rw-r--r-- | diff-tree.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/commit-tree.c b/commit-tree.c index 4fe64ce0b4..352ded104c 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 5cf6057f45..1960c23561 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; } |