2008-07-04 03:09:48 +08:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='remote tracking stats'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
advance () {
|
|
|
|
echo "$1" >"$1" &&
|
|
|
|
git add "$1" &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "$1"
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
for i in a b c;
|
|
|
|
do
|
|
|
|
advance $i || break
|
|
|
|
done &&
|
|
|
|
git clone . test &&
|
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git checkout -b b1 origin &&
|
|
|
|
git reset --hard HEAD^ &&
|
|
|
|
advance d &&
|
|
|
|
git checkout -b b2 origin &&
|
|
|
|
git reset --hard b1 &&
|
|
|
|
git checkout -b b3 origin &&
|
|
|
|
git reset --hard HEAD^ &&
|
|
|
|
git checkout -b b4 origin &&
|
|
|
|
advance e &&
|
|
|
|
advance f
|
2009-03-27 04:53:24 +08:00
|
|
|
) &&
|
|
|
|
git checkout -b follower --track master &&
|
|
|
|
advance g
|
2008-07-04 03:09:48 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
script='s/^..\(b.\)[ 0-9a-f]*\[\([^]]*\)\].*/\1 \2/p'
|
|
|
|
cat >expect <<\EOF
|
|
|
|
b1 ahead 1, behind 1
|
|
|
|
b2 ahead 1, behind 1
|
|
|
|
b3 behind 1
|
|
|
|
b4 ahead 2
|
|
|
|
EOF
|
|
|
|
|
2011-04-13 07:33:39 +08:00
|
|
|
test_expect_success 'branch -v' '
|
2008-07-04 03:09:48 +08:00
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git branch -v
|
|
|
|
) |
|
|
|
|
sed -n -e "$script" >actual &&
|
2011-04-13 07:33:39 +08:00
|
|
|
test_i18ncmp expect actual
|
2008-07-04 03:09:48 +08:00
|
|
|
'
|
|
|
|
|
2011-08-26 22:05:11 +08:00
|
|
|
cat >expect <<\EOF
|
|
|
|
b1 origin/master: ahead 1, behind 1
|
|
|
|
b2 origin/master: ahead 1, behind 1
|
|
|
|
b3 origin/master: behind 1
|
|
|
|
b4 origin/master: ahead 2
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'branch -vv' '
|
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git branch -vv
|
|
|
|
) |
|
|
|
|
sed -n -e "$script" >actual &&
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
'
|
|
|
|
|
2008-07-04 03:09:48 +08:00
|
|
|
test_expect_success 'checkout' '
|
|
|
|
(
|
|
|
|
cd test && git checkout b1
|
|
|
|
) >actual &&
|
2012-04-14 12:45:31 +08:00
|
|
|
test_i18ngrep "have 1 and 1 different" actual
|
2008-07-04 03:09:48 +08:00
|
|
|
'
|
|
|
|
|
2009-04-02 05:42:49 +08:00
|
|
|
test_expect_success 'checkout with local tracked branch' '
|
2009-03-27 04:53:24 +08:00
|
|
|
git checkout master &&
|
2010-10-31 09:46:54 +08:00
|
|
|
git checkout follower >actual &&
|
2012-04-14 12:45:31 +08:00
|
|
|
test_i18ngrep "is ahead of" actual
|
2009-03-27 04:53:24 +08:00
|
|
|
'
|
|
|
|
|
2008-07-04 03:09:48 +08:00
|
|
|
test_expect_success 'status' '
|
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git checkout b1 >/dev/null &&
|
|
|
|
# reports nothing to commit
|
2009-08-15 17:27:39 +08:00
|
|
|
test_must_fail git commit --dry-run
|
2008-07-04 03:09:48 +08:00
|
|
|
) >actual &&
|
2012-04-14 12:45:31 +08:00
|
|
|
test_i18ngrep "have 1 and 1 different" actual
|
2008-07-04 03:09:48 +08:00
|
|
|
'
|
|
|
|
|
2011-02-17 07:12:20 +08:00
|
|
|
test_expect_success 'fail to track lightweight tags' '
|
2009-05-11 22:42:53 +08:00
|
|
|
git checkout master &&
|
|
|
|
git tag light &&
|
2011-02-17 07:12:20 +08:00
|
|
|
test_must_fail git branch --track lighttrack light >actual &&
|
2012-04-14 12:45:31 +08:00
|
|
|
test_i18ngrep ! "set up to track" actual &&
|
2011-02-17 07:12:20 +08:00
|
|
|
test_must_fail git checkout lighttrack
|
2009-05-11 22:42:53 +08:00
|
|
|
'
|
2008-07-04 03:09:48 +08:00
|
|
|
|
2011-02-17 07:12:20 +08:00
|
|
|
test_expect_success 'fail to track annotated tags' '
|
2009-05-11 22:42:53 +08:00
|
|
|
git checkout master &&
|
|
|
|
git tag -m heavy heavy &&
|
2011-02-17 07:12:20 +08:00
|
|
|
test_must_fail git branch --track heavytrack heavy >actual &&
|
2012-04-14 12:45:31 +08:00
|
|
|
test_i18ngrep ! "set up to track" actual &&
|
2011-02-17 07:12:20 +08:00
|
|
|
test_must_fail git checkout heavytrack
|
2009-05-11 22:42:53 +08:00
|
|
|
'
|
2010-01-19 04:44:11 +08:00
|
|
|
|
|
|
|
test_expect_success 'setup tracking with branch --set-upstream on existing branch' '
|
|
|
|
git branch from-master master &&
|
|
|
|
test_must_fail git config branch.from-master.merge > actual &&
|
|
|
|
git branch --set-upstream from-master master &&
|
|
|
|
git config branch.from-master.merge > actual &&
|
|
|
|
grep -q "^refs/heads/master$" actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--set-upstream does not change branch' '
|
|
|
|
git branch from-master2 master &&
|
|
|
|
test_must_fail git config branch.from-master2.merge > actual &&
|
|
|
|
git rev-list from-master2 &&
|
|
|
|
git update-ref refs/heads/from-master2 from-master2^ &&
|
|
|
|
git rev-parse from-master2 >expect2 &&
|
|
|
|
git branch --set-upstream from-master2 master &&
|
|
|
|
git config branch.from-master.merge > actual &&
|
|
|
|
git rev-parse from-master2 >actual2 &&
|
|
|
|
grep -q "^refs/heads/master$" actual &&
|
|
|
|
cmp expect2 actual2
|
|
|
|
'
|
2011-08-19 19:45:43 +08:00
|
|
|
|
|
|
|
test_expect_success '--set-upstream @{-1}' '
|
|
|
|
git checkout from-master &&
|
|
|
|
git checkout from-master2 &&
|
|
|
|
git config branch.from-master2.merge > expect2 &&
|
|
|
|
git branch --set-upstream @{-1} follower &&
|
|
|
|
git config branch.from-master.merge > actual &&
|
|
|
|
git config branch.from-master2.merge > actual2 &&
|
|
|
|
git branch --set-upstream from-master follower &&
|
|
|
|
git config branch.from-master.merge > expect &&
|
|
|
|
test_cmp expect2 actual2 &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2008-07-04 03:09:48 +08:00
|
|
|
test_done
|