Verify git-commit provides a reflog message.
The reflog message from git-commit should include the first line of the commit message as supplied by the user. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
a5c8a98ca7
commit
9c7466fa24
@ -178,22 +178,36 @@ rm -f .git/$m .git/logs/$m expect
|
|||||||
|
|
||||||
test_expect_success \
|
test_expect_success \
|
||||||
'creating initial files' \
|
'creating initial files' \
|
||||||
'cp ../../COPYING COPYING &&
|
'echo TEST >F &&
|
||||||
git-add COPYING &&
|
git-add F &&
|
||||||
|
GIT_AUTHOR_DATE="2005-05-26 23:30" \
|
||||||
GIT_COMMITTER_DATE="2005-05-26 23:30" git-commit -m add -a &&
|
GIT_COMMITTER_DATE="2005-05-26 23:30" git-commit -m add -a &&
|
||||||
cp ../../Makefile COPYING &&
|
h_TEST=$(git-rev-parse --verify HEAD)
|
||||||
GIT_COMMITTER_DATE="2005-05-26 23:41" git-commit -m change -a'
|
echo The other day this did not work. >M &&
|
||||||
|
echo And then Bob told me how to fix it. >>M &&
|
||||||
|
echo OTHER >F &&
|
||||||
|
GIT_AUTHOR_DATE="2005-05-26 23:41" \
|
||||||
|
GIT_COMMITTER_DATE="2005-05-26 23:41" git-commit -F M -a &&
|
||||||
|
h_OTHER=$(git-rev-parse --verify HEAD)
|
||||||
|
rm -f M'
|
||||||
|
|
||||||
|
cat >expect <<EOF
|
||||||
|
$Z $h_TEST $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 commit: add
|
||||||
|
$h_TEST $h_OTHER $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000 commit: The other day this did not work.
|
||||||
|
EOF
|
||||||
|
test_expect_success \
|
||||||
|
'git-commit logged updates' \
|
||||||
|
'diff expect .git/logs/$m'
|
||||||
|
unset h_TEST h_OTHER
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success \
|
||||||
'git-cat-file blob master:COPYING (expect Makefile)' \
|
'git-cat-file blob master:F (expect OTHER)' \
|
||||||
'git-cat-file blob master:COPYING | diff - ../../Makefile'
|
'test OTHER = $(git-cat-file blob master:F)'
|
||||||
test_expect_success \
|
test_expect_success \
|
||||||
'git-cat-file blob master@{2005-05-26 23:30}:COPYING (expect COPYING)' \
|
'git-cat-file blob master@{2005-05-26 23:30}:F (expect TEST)' \
|
||||||
'git-cat-file blob "master@{2005-05-26 23:30}:COPYING" \
|
'test TEST = $(git-cat-file blob "master@{2005-05-26 23:30}:F")'
|
||||||
| diff - ../../COPYING'
|
|
||||||
test_expect_success \
|
test_expect_success \
|
||||||
'git-cat-file blob master@{2005-05-26 23:42}:COPYING (expect Makefile)' \
|
'git-cat-file blob master@{2005-05-26 23:42}:F (expect OTHER)' \
|
||||||
'git-cat-file blob "master@{2005-05-26 23:42}:COPYING" \
|
'test OTHER = $(git-cat-file blob "master@{2005-05-26 23:42}:F")'
|
||||||
| diff - ../../Makefile'
|
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
Loading…
Reference in New Issue
Block a user