mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-17 22:44:49 +01:00
Code Activity

Merge branch 'sp/reflog' into next

Browse source 
* sp/reflog:
  Test that git-branch -l works.
  Verify git-commit provides a reflog message.
This commit is contained in:
Junio C Hamano 2006-05-24 22:32:44 -07:00
commit f579d3c2b8
3 changed files with 58 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
git-checkout.sh
View file

@ -197,8 +197,8 @@ fi
if [ "$?" -eq 0 ]; then if [ "$?" -eq 0 ]; then
if [ "$newbranch" ]; then if [ "$newbranch" ]; then
if [ "$newbranch_log" ]; then if [ "$newbranch_log" ]; then
mkdir -p $(dirname "$GIT_DIR/logs/refs/heads/$branchname") mkdir -p $(dirname "$GIT_DIR/logs/refs/heads/$newbranch")
touch "$GIT_DIR/logs/refs/heads/$branchname" touch "$GIT_DIR/logs/refs/heads/$newbranch"
fi fi
git-update-ref -m "checkout: Created from $new_name" "refs/heads/$newbranch" $new || exit git-update-ref -m "checkout: Created from $new_name" "refs/heads/$newbranch" $new || exit
branch="$newbranch" branch="$newbranch"

38
t/t1400-update-ref.sh
View file

@ -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

31
t/t3200-branch.sh
View file

@ -14,7 +14,8 @@ test_expect_success \
'prepare an trivial repository' \ 'prepare an trivial repository' \
'echo Hello > A && 'echo Hello > A &&
git-update-index --add A && git-update-index --add A &&
git-commit -m "Initial commit."' git-commit -m "Initial commit." &&
HEAD=$(git-rev-parse --verify HEAD)'
test_expect_success \ test_expect_success \
'git branch --help should return success now.' \ 'git branch --help should return success now.' \
@ -32,4 +33,32 @@ test_expect_success \
'git branch a/b/c should create a branch' \ 'git branch a/b/c should create a branch' \
'git-branch a/b/c && test -f .git/refs/heads/a/b/c' 'git-branch a/b/c && test -f .git/refs/heads/a/b/c'
cat >expect <<EOF
0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from HEAD
EOF
test_expect_success \
'git branch -l d/e/f should create a branch and a log' \
'GIT_COMMITTER_DATE="2005-05-26 23:30" \
git-branch -l d/e/f &&
test -f .git/refs/heads/d/e/f &&
test -f .git/logs/refs/heads/d/e/f &&
diff expect .git/logs/refs/heads/d/e/f'
test_expect_success \
'git branch -d d/e/f should delete a branch and a log' \
'git-branch -d d/e/f &&
test ! -f .git/refs/heads/d/e/f &&
test ! -f .git/logs/refs/heads/d/e/f'
cat >expect <<EOF
0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 checkout: Created from master^0
EOF
test_expect_success \
'git checkout -b g/h/i -l should create a branch and a log' \
'GIT_COMMITTER_DATE="2005-05-26 23:30" \
git-checkout -b g/h/i -l master &&
test -f .git/refs/heads/g/h/i &&
test -f .git/logs/refs/heads/g/h/i &&
diff expect .git/logs/refs/heads/g/h/i'
test_done test_done