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

From

Rene Scharfe <rene.scharfe@lsrfire.ath.cx>

Date

May 26, 2005, 23:03 UTC

Message-ID

<20050526230326.GA14736@lsrfire.ath.cx>

Actually use GIT_COMMITTER_DATE in git-commit-tree.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>

 commit-tree.c                  |    2 -
 t/t1100-commit-tree-options.sh |   45 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

Index: commit-tree.c
===================================================================
--- dbec0de73e52d5b6d0740dd2e226d3ce8e2e51fd/commit-tree.c  (mode:100644)
+++ 97976f550804169368e1e30cd26ead9980461a84/commit-tree.c  (mode:100644)
@@ -153,7 +153,7 @@
 		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);
Index: t/t1100-commit-tree-options.sh
===================================================================
--- /dev/null  (tree:dbec0de73e52d5b6d0740dd2e226d3ce8e2e51fd)
+++ 97976f550804169368e1e30cd26ead9980461a84/t/t1100-commit-tree-options.sh  (mode:100755)
@@ -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