Revision 2c733fb24c10a9d7aacc51f956bf9b7881980870 authored by Junio C Hamano on 02 February 2012, 21:41:43 UTC, committed by Junio C Hamano on 04 February 2012, 07:11:32 UTC
The only place that the issue this series addresses was observed where we read "cat-file commit" output and put it in GIT_AUTHOR_DATE in order to replay a commit with an ancient timestamp. With the previous patch alone, "git commit --date='20100917 +0900'" can be misinterpreted to mean an ancient timestamp, not September in year 2010. Guard this codepath by requring an extra '@' in front of the raw git timestamp on the parsing side. This of course needs to be compensated by updating get_author_ident_from_commit and the code for "git commit --amend" to prepend '@' to the string read from the existing commit in the GIT_AUTHOR_DATE environment variable. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 116eb3a
t5706-clone-branch.sh
#!/bin/sh
test_description='clone --branch option'
. ./test-lib.sh
check_HEAD() {
echo refs/heads/"$1" >expect &&
git symbolic-ref HEAD >actual &&
test_cmp expect actual
}
check_file() {
echo "$1" >expect &&
test_cmp expect file
}
test_expect_success 'setup' '
mkdir parent &&
(cd parent && git init &&
echo one >file && git add file && git commit -m one &&
git checkout -b two &&
echo two >file && git add file && git commit -m two &&
git checkout master)
'
test_expect_success 'vanilla clone chooses HEAD' '
git clone parent clone &&
(cd clone &&
check_HEAD master &&
check_file one
)
'
test_expect_success 'clone -b chooses specified branch' '
git clone -b two parent clone-two &&
(cd clone-two &&
check_HEAD two &&
check_file two
)
'
test_expect_success 'clone -b sets up tracking' '
(cd clone-two &&
echo origin >expect &&
git config branch.two.remote >actual &&
echo refs/heads/two >>expect &&
git config branch.two.merge >>actual &&
test_cmp expect actual
)
'
test_expect_success 'clone -b does not munge remotes/origin/HEAD' '
(cd clone-two &&
echo refs/remotes/origin/master >expect &&
git symbolic-ref refs/remotes/origin/HEAD >actual &&
test_cmp expect actual
)
'
test_expect_success 'clone -b with bogus branch chooses HEAD' '
git clone -b bogus parent clone-bogus &&
(cd clone-bogus &&
check_HEAD master &&
check_file one
)
'
test_done
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...