[PATCH] fix and testcase for git-commit-tree option

Actually use GIT_COMMITTER_DATE in git-commit-tree.

(It used to mistakenly re-use the author date)

Add test-case for it.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/commit-tree.c b/commit-tree.c
index e9069971a8bbe413ceb71f63fc48513a475a4d6f..1d125b8412f0eff6576e8c91343bbf8d9726247d 100644 (file)
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -153,7 +153,7 @@ int main(int argc, char **argv)
                parse_date(audate, date, sizeof(date));
        cmdate = gitenv("GIT_COMMITTER_DATE");
        if (cmdate)
-               parse_date(audate, realdate, sizeof(realdate));
+               parse_date(cmdate, realdate, sizeof(realdate));
 
        remove_special(gecos); remove_special(realgecos); remove_special(commitgecos);
        remove_special(email); remove_special(realemail); remove_special(commitemail);

diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh
new file mode 100644 (file)
index 0000000..e59f724
--- /dev/null
+++ b/t/t1100-commit-tree-options.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# Copyright (C) 2005 Rene Scharfe
+#
+
+test_description='git-commit-tree options test
+
+This test checks that git-commit-tree can create a specific commit
+object by defining all environment variables that it understands.
+'
+
+. ./test-lib.sh
+
+cat >expected <<EOF
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+author Author Name <author@email> 1117148400 +0000
+committer Committer Name <committer@email> 1117150200 +0000
+
+comment text
+EOF
+
+test_expect_success \
+    'test preparation: write empty tree' \
+    'git-write-tree >treeid'
+
+test_expect_success \
+    'construct commit' \
+    'echo comment text |
+     GIT_AUTHOR_NAME="Author Name" \
+     GIT_AUTHOR_EMAIL="author@email" \
+     GIT_AUTHOR_DATE="2005-05-26 23:00" \
+     GIT_COMMITTER_NAME="Committer Name" \
+     GIT_COMMITTER_EMAIL="committer@email" \
+     GIT_COMMITTER_DATE="2005-05-26 23:30" \
+     TZ= git-commit-tree `cat treeid` >commitid 2>/dev/null'
+
+test_expect_success \
+    'read commit' \
+    'git-cat-file commit `cat commitid` >commit'
+
+test_expect_success \
+    'compare commit' \
+    'diff expected commit'
+
+test_done