summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Scharfe <rene.scharfe@lsrfire.ath.cx>2005-05-26 23:03:26 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-26 23:21:13 (GMT)
commitc504aae2a6c96f1363562a3aa1dc05fb4462e978 (patch)
tree2e993f0b7920f564fc1822fb9028707707816854
parent2eab945e865317cb7d390aec214303f1d931b53a (diff)
downloadgit-c504aae2a6c96f1363562a3aa1dc05fb4462e978.zip
git-c504aae2a6c96f1363562a3aa1dc05fb4462e978.tar.gz
git-c504aae2a6c96f1363562a3aa1dc05fb4462e978.tar.bz2
[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>
-rw-r--r--commit-tree.c2
-rw-r--r--t/t1100-commit-tree-options.sh45
2 files changed, 46 insertions, 1 deletions
diff --git a/commit-tree.c b/commit-tree.c
index e906997..1d125b8 100644
--- 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
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