summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-27 01:25:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-27 01:25:15 (GMT)
commit9af0b8dbe2fb252262412a11254e2bcc6ffb87bb (patch)
treec89e1d7e23a82438789e841ceb617a4f047f89da
parent69bcc43eca0f251617e3b5db5df632b24db94e92 (diff)
downloadgit-9af0b8dbe2fb252262412a11254e2bcc6ffb87bb.zip
git-9af0b8dbe2fb252262412a11254e2bcc6ffb87bb.tar.gz
git-9af0b8dbe2fb252262412a11254e2bcc6ffb87bb.tar.bz2
t0000-basic: more commit-tree tests.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xt/t0000-basic.sh28
1 files changed, 28 insertions, 0 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index c69706f..cf33989 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -226,4 +226,32 @@ test_expect_success \
'no diff after checkout and git-update-index --refresh.' \
'git-diff-files >current && cmp -s current /dev/null'
+################################################################
+P=087704a96baf1c2d1c869a8b084481e121c88b5b
+test_expect_success \
+ 'git-commit-tree records the correct tree in a commit.' \
+ 'commit0=$(echo NO | git-commit-tree $P) &&
+ tree=$(git show --pretty=raw $commit0 |
+ sed -n -e "s/^tree //p" -e "/^author /q") &&
+ test "z$tree" = "z$P"'
+
+test_expect_success \
+ 'git-commit-tree records the correct parent in a commit.' \
+ 'commit1=$(echo NO | git-commit-tree $P -p $commit0) &&
+ parent=$(git show --pretty=raw $commit1 |
+ sed -n -e "s/^parent //p" -e "/^author /q") &&
+ test "z$commit0" = "z$parent"'
+
+test_expect_success \
+ 'git-commit-tree omits duplicated parent in a commit.' \
+ 'commit2=$(echo NO | git-commit-tree $P -p $commit0 -p $commit0) &&
+ parent=$(git show --pretty=raw $commit2 |
+ sed -n -e "s/^parent //p" -e "/^author /q" |
+ sort -u) &&
+ test "z$commit0" = "z$parent" &&
+ numparent=$(git show --pretty=raw $commit2 |
+ sed -n -e "s/^parent //p" -e "/^author /q" |
+ wc -l) &&
+ test $numparent = 1'
+
test_done