From c504aae2a6c96f1363562a3aa1dc05fb4462e978 Mon Sep 17 00:00:00 2001 From: Rene Scharfe Date: Fri, 27 May 2005 01:03:26 +0200 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- commit-tree.c | 2 +- t/t1100-commit-tree-options.sh | 45 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 t/t1100-commit-tree-options.sh diff --git a/commit-tree.c b/commit-tree.c index e9069971..1d125b84 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 00000000..e59f724f --- /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 < 1117148400 +0000 +committer Committer Name 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 -- 2.11.0