2008-07-03 23:09:48 +04: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 '
|
2015-03-25 08:29:52 +03:00
|
|
|
advance a &&
|
|
|
|
advance b &&
|
|
|
|
advance c &&
|
2008-07-03 23:09:48 +04:00
|
|
|
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 &&
|
branch: report invalid tracking branch as gone
Command "git branch -vv" will report tracking branches, but invalid
tracking branches are also reported. This is because the function
stat_tracking_info() can not distinguish invalid tracking branch
from other cases which it would not like to report, such as
there is no upstream settings at all, or nothing is changed between
one branch and its upstream.
Junio suggested missing upstream should be reported [1] like:
$ git branch -v -v
master e67ac84 initial
* topic 3fc0f2a [topicbase: gone] topic
$ git status
# On branch topic
# Your branch is based on 'topicbase', but the upstream is gone.
# (use "git branch --unset-upstream" to fixup)
...
$ git status -b -s
## topic...topicbase [gone]
...
In order to do like that, we need to distinguish these three cases
(i.e. no tracking, with configured but no longer valid tracking, and
with tracking) in function stat_tracking_info(). So the refactored
function stat_tracking_info() has three return values: -1 (with "gone"
base), 0 (no base), and 1 (with base).
If the caller does not like to report tracking info when nothing
changed between the branch and its upstream, simply checks if
num_theirs and num_ours are both 0.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/231830/focus=232288
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-26 11:02:48 +04:00
|
|
|
advance f &&
|
|
|
|
git checkout -b brokenbase origin &&
|
|
|
|
git checkout -b b5 --track brokenbase &&
|
|
|
|
advance g &&
|
2013-08-26 11:02:49 +04:00
|
|
|
git branch -d brokenbase &&
|
|
|
|
git checkout -b b6 origin
|
2009-03-26 23:53:24 +03:00
|
|
|
) &&
|
|
|
|
git checkout -b follower --track master &&
|
branch: report invalid tracking branch as gone
Command "git branch -vv" will report tracking branches, but invalid
tracking branches are also reported. This is because the function
stat_tracking_info() can not distinguish invalid tracking branch
from other cases which it would not like to report, such as
there is no upstream settings at all, or nothing is changed between
one branch and its upstream.
Junio suggested missing upstream should be reported [1] like:
$ git branch -v -v
master e67ac84 initial
* topic 3fc0f2a [topicbase: gone] topic
$ git status
# On branch topic
# Your branch is based on 'topicbase', but the upstream is gone.
# (use "git branch --unset-upstream" to fixup)
...
$ git status -b -s
## topic...topicbase [gone]
...
In order to do like that, we need to distinguish these three cases
(i.e. no tracking, with configured but no longer valid tracking, and
with tracking) in function stat_tracking_info(). So the refactored
function stat_tracking_info() has three return values: -1 (with "gone"
base), 0 (no base), and 1 (with base).
If the caller does not like to report tracking info when nothing
changed between the branch and its upstream, simply checks if
num_theirs and num_ours are both 0.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/231830/focus=232288
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-26 11:02:48 +04:00
|
|
|
advance h
|
2008-07-03 23:09:48 +04:00
|
|
|
'
|
|
|
|
|
2013-11-14 22:18:01 +04:00
|
|
|
script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p'
|
2008-07-03 23:09:48 +04:00
|
|
|
cat >expect <<\EOF
|
2013-11-14 22:18:01 +04:00
|
|
|
b1 [ahead 1, behind 1] d
|
|
|
|
b2 [ahead 1, behind 1] d
|
|
|
|
b3 [behind 1] b
|
|
|
|
b4 [ahead 2] f
|
2017-01-10 11:49:52 +03:00
|
|
|
b5 [gone] g
|
2013-11-14 22:18:01 +04:00
|
|
|
b6 c
|
2008-07-03 23:09:48 +04:00
|
|
|
EOF
|
|
|
|
|
2011-04-13 03:33:39 +04:00
|
|
|
test_expect_success 'branch -v' '
|
2008-07-03 23:09:48 +04:00
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git branch -v
|
|
|
|
) |
|
|
|
|
sed -n -e "$script" >actual &&
|
2011-04-13 03:33:39 +04:00
|
|
|
test_i18ncmp expect actual
|
2008-07-03 23:09:48 +04:00
|
|
|
'
|
|
|
|
|
2011-08-26 18:05:11 +04:00
|
|
|
cat >expect <<\EOF
|
2013-11-14 22:18:01 +04:00
|
|
|
b1 [origin/master: ahead 1, behind 1] d
|
|
|
|
b2 [origin/master: ahead 1, behind 1] d
|
|
|
|
b3 [origin/master: behind 1] b
|
|
|
|
b4 [origin/master: ahead 2] f
|
|
|
|
b5 [brokenbase: gone] g
|
|
|
|
b6 [origin/master] c
|
2011-08-26 18:05:11 +04:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'branch -vv' '
|
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git branch -vv
|
|
|
|
) |
|
|
|
|
sed -n -e "$script" >actual &&
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
'
|
|
|
|
|
branch: report invalid tracking branch as gone
Command "git branch -vv" will report tracking branches, but invalid
tracking branches are also reported. This is because the function
stat_tracking_info() can not distinguish invalid tracking branch
from other cases which it would not like to report, such as
there is no upstream settings at all, or nothing is changed between
one branch and its upstream.
Junio suggested missing upstream should be reported [1] like:
$ git branch -v -v
master e67ac84 initial
* topic 3fc0f2a [topicbase: gone] topic
$ git status
# On branch topic
# Your branch is based on 'topicbase', but the upstream is gone.
# (use "git branch --unset-upstream" to fixup)
...
$ git status -b -s
## topic...topicbase [gone]
...
In order to do like that, we need to distinguish these three cases
(i.e. no tracking, with configured but no longer valid tracking, and
with tracking) in function stat_tracking_info(). So the refactored
function stat_tracking_info() has three return values: -1 (with "gone"
base), 0 (no base), and 1 (with base).
If the caller does not like to report tracking info when nothing
changed between the branch and its upstream, simply checks if
num_theirs and num_ours are both 0.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/231830/focus=232288
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-26 11:02:48 +04:00
|
|
|
test_expect_success 'checkout (diverged from upstream)' '
|
2008-07-03 23:09:48 +04:00
|
|
|
(
|
|
|
|
cd test && git checkout b1
|
|
|
|
) >actual &&
|
2012-04-14 08:45:31 +04:00
|
|
|
test_i18ngrep "have 1 and 1 different" actual
|
2008-07-03 23:09:48 +04:00
|
|
|
'
|
|
|
|
|
2009-04-02 01:42:49 +04:00
|
|
|
test_expect_success 'checkout with local tracked branch' '
|
2009-03-26 23:53:24 +03:00
|
|
|
git checkout master &&
|
2010-10-31 04:46:54 +03:00
|
|
|
git checkout follower >actual &&
|
2012-04-14 08:45:31 +04:00
|
|
|
test_i18ngrep "is ahead of" actual
|
2009-03-26 23:53:24 +03:00
|
|
|
'
|
|
|
|
|
branch: report invalid tracking branch as gone
Command "git branch -vv" will report tracking branches, but invalid
tracking branches are also reported. This is because the function
stat_tracking_info() can not distinguish invalid tracking branch
from other cases which it would not like to report, such as
there is no upstream settings at all, or nothing is changed between
one branch and its upstream.
Junio suggested missing upstream should be reported [1] like:
$ git branch -v -v
master e67ac84 initial
* topic 3fc0f2a [topicbase: gone] topic
$ git status
# On branch topic
# Your branch is based on 'topicbase', but the upstream is gone.
# (use "git branch --unset-upstream" to fixup)
...
$ git status -b -s
## topic...topicbase [gone]
...
In order to do like that, we need to distinguish these three cases
(i.e. no tracking, with configured but no longer valid tracking, and
with tracking) in function stat_tracking_info(). So the refactored
function stat_tracking_info() has three return values: -1 (with "gone"
base), 0 (no base), and 1 (with base).
If the caller does not like to report tracking info when nothing
changed between the branch and its upstream, simply checks if
num_theirs and num_ours are both 0.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/231830/focus=232288
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-26 11:02:48 +04:00
|
|
|
test_expect_success 'checkout (upstream is gone)' '
|
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git checkout b5
|
|
|
|
) >actual &&
|
|
|
|
test_i18ngrep "is based on .*, but the upstream is gone." actual
|
|
|
|
'
|
|
|
|
|
2013-08-26 11:02:49 +04:00
|
|
|
test_expect_success 'checkout (up-to-date with upstream)' '
|
|
|
|
(
|
|
|
|
cd test && git checkout b6
|
|
|
|
) >actual &&
|
2017-08-23 20:49:35 +03:00
|
|
|
test_i18ngrep "Your branch is up to date with .origin/master" actual
|
2013-08-26 11:02:49 +04:00
|
|
|
'
|
|
|
|
|
branch: report invalid tracking branch as gone
Command "git branch -vv" will report tracking branches, but invalid
tracking branches are also reported. This is because the function
stat_tracking_info() can not distinguish invalid tracking branch
from other cases which it would not like to report, such as
there is no upstream settings at all, or nothing is changed between
one branch and its upstream.
Junio suggested missing upstream should be reported [1] like:
$ git branch -v -v
master e67ac84 initial
* topic 3fc0f2a [topicbase: gone] topic
$ git status
# On branch topic
# Your branch is based on 'topicbase', but the upstream is gone.
# (use "git branch --unset-upstream" to fixup)
...
$ git status -b -s
## topic...topicbase [gone]
...
In order to do like that, we need to distinguish these three cases
(i.e. no tracking, with configured but no longer valid tracking, and
with tracking) in function stat_tracking_info(). So the refactored
function stat_tracking_info() has three return values: -1 (with "gone"
base), 0 (no base), and 1 (with base).
If the caller does not like to report tracking info when nothing
changed between the branch and its upstream, simply checks if
num_theirs and num_ours are both 0.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/231830/focus=232288
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-26 11:02:48 +04:00
|
|
|
test_expect_success 'status (diverged from upstream)' '
|
2008-07-03 23:09:48 +04:00
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git checkout b1 >/dev/null &&
|
|
|
|
# reports nothing to commit
|
2009-08-15 13:27:39 +04:00
|
|
|
test_must_fail git commit --dry-run
|
2008-07-03 23:09:48 +04:00
|
|
|
) >actual &&
|
2012-04-14 08:45:31 +04:00
|
|
|
test_i18ngrep "have 1 and 1 different" actual
|
2008-07-03 23:09:48 +04:00
|
|
|
'
|
|
|
|
|
branch: report invalid tracking branch as gone
Command "git branch -vv" will report tracking branches, but invalid
tracking branches are also reported. This is because the function
stat_tracking_info() can not distinguish invalid tracking branch
from other cases which it would not like to report, such as
there is no upstream settings at all, or nothing is changed between
one branch and its upstream.
Junio suggested missing upstream should be reported [1] like:
$ git branch -v -v
master e67ac84 initial
* topic 3fc0f2a [topicbase: gone] topic
$ git status
# On branch topic
# Your branch is based on 'topicbase', but the upstream is gone.
# (use "git branch --unset-upstream" to fixup)
...
$ git status -b -s
## topic...topicbase [gone]
...
In order to do like that, we need to distinguish these three cases
(i.e. no tracking, with configured but no longer valid tracking, and
with tracking) in function stat_tracking_info(). So the refactored
function stat_tracking_info() has three return values: -1 (with "gone"
base), 0 (no base), and 1 (with base).
If the caller does not like to report tracking info when nothing
changed between the branch and its upstream, simply checks if
num_theirs and num_ours are both 0.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/231830/focus=232288
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-26 11:02:48 +04:00
|
|
|
test_expect_success 'status (upstream is gone)' '
|
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git checkout b5 >/dev/null &&
|
|
|
|
# reports nothing to commit
|
|
|
|
test_must_fail git commit --dry-run
|
|
|
|
) >actual &&
|
|
|
|
test_i18ngrep "is based on .*, but the upstream is gone." actual
|
|
|
|
'
|
|
|
|
|
2013-08-26 11:02:49 +04:00
|
|
|
test_expect_success 'status (up-to-date with upstream)' '
|
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git checkout b6 >/dev/null &&
|
|
|
|
# reports nothing to commit
|
|
|
|
test_must_fail git commit --dry-run
|
|
|
|
) >actual &&
|
2017-08-23 20:49:35 +03:00
|
|
|
test_i18ngrep "Your branch is up to date with .origin/master" actual
|
2013-08-26 11:02:49 +04:00
|
|
|
'
|
|
|
|
|
branch: report invalid tracking branch as gone
Command "git branch -vv" will report tracking branches, but invalid
tracking branches are also reported. This is because the function
stat_tracking_info() can not distinguish invalid tracking branch
from other cases which it would not like to report, such as
there is no upstream settings at all, or nothing is changed between
one branch and its upstream.
Junio suggested missing upstream should be reported [1] like:
$ git branch -v -v
master e67ac84 initial
* topic 3fc0f2a [topicbase: gone] topic
$ git status
# On branch topic
# Your branch is based on 'topicbase', but the upstream is gone.
# (use "git branch --unset-upstream" to fixup)
...
$ git status -b -s
## topic...topicbase [gone]
...
In order to do like that, we need to distinguish these three cases
(i.e. no tracking, with configured but no longer valid tracking, and
with tracking) in function stat_tracking_info(). So the refactored
function stat_tracking_info() has three return values: -1 (with "gone"
base), 0 (no base), and 1 (with base).
If the caller does not like to report tracking info when nothing
changed between the branch and its upstream, simply checks if
num_theirs and num_ours are both 0.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/231830/focus=232288
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-26 11:02:48 +04:00
|
|
|
cat >expect <<\EOF
|
|
|
|
## b1...origin/master [ahead 1, behind 1]
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'status -s -b (diverged from upstream)' '
|
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git checkout b1 >/dev/null &&
|
|
|
|
git status -s -b | head -1
|
|
|
|
) >actual &&
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<\EOF
|
|
|
|
## b5...brokenbase [gone]
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'status -s -b (upstream is gone)' '
|
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git checkout b5 >/dev/null &&
|
|
|
|
git status -s -b | head -1
|
|
|
|
) >actual &&
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
'
|
|
|
|
|
2013-08-26 11:02:49 +04:00
|
|
|
cat >expect <<\EOF
|
|
|
|
## b6...origin/master
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'status -s -b (up-to-date with upstream)' '
|
|
|
|
(
|
|
|
|
cd test &&
|
|
|
|
git checkout b6 >/dev/null &&
|
|
|
|
git status -s -b | head -1
|
|
|
|
) >actual &&
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
'
|
|
|
|
|
2011-02-17 02:12:20 +03:00
|
|
|
test_expect_success 'fail to track lightweight tags' '
|
2009-05-11 18:42:53 +04:00
|
|
|
git checkout master &&
|
|
|
|
git tag light &&
|
2011-02-17 02:12:20 +03:00
|
|
|
test_must_fail git branch --track lighttrack light >actual &&
|
2012-04-14 08:45:31 +04:00
|
|
|
test_i18ngrep ! "set up to track" actual &&
|
2011-02-17 02:12:20 +03:00
|
|
|
test_must_fail git checkout lighttrack
|
2009-05-11 18:42:53 +04:00
|
|
|
'
|
2008-07-03 23:09:48 +04:00
|
|
|
|
2011-02-17 02:12:20 +03:00
|
|
|
test_expect_success 'fail to track annotated tags' '
|
2009-05-11 18:42:53 +04:00
|
|
|
git checkout master &&
|
|
|
|
git tag -m heavy heavy &&
|
2011-02-17 02:12:20 +03:00
|
|
|
test_must_fail git branch --track heavytrack heavy >actual &&
|
2012-04-14 08:45:31 +04:00
|
|
|
test_i18ngrep ! "set up to track" actual &&
|
2011-02-17 02:12:20 +03:00
|
|
|
test_must_fail git checkout heavytrack
|
2009-05-11 18:42:53 +04:00
|
|
|
'
|
2010-01-18 23:44:11 +03:00
|
|
|
|
2017-08-17 05:54:24 +03:00
|
|
|
test_expect_success '--set-upstream-to does not change branch' '
|
2010-01-18 23:44:11 +03:00
|
|
|
git branch from-master master &&
|
2017-08-17 05:54:24 +03:00
|
|
|
git branch --set-upstream-to master from-master &&
|
2010-01-18 23:44:11 +03:00
|
|
|
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 &&
|
2017-08-17 05:54:24 +03:00
|
|
|
git branch --set-upstream-to master from-master2 &&
|
2010-01-18 23:44:11 +03:00
|
|
|
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 15:45:43 +04:00
|
|
|
|
2017-08-17 05:54:24 +03:00
|
|
|
test_expect_success '--set-upstream-to @{-1}' '
|
|
|
|
git checkout follower &&
|
2011-08-19 15:45:43 +04:00
|
|
|
git checkout from-master2 &&
|
|
|
|
git config branch.from-master2.merge > expect2 &&
|
2017-08-17 05:54:24 +03:00
|
|
|
git branch --set-upstream-to @{-1} from-master &&
|
2011-08-19 15:45:43 +04:00
|
|
|
git config branch.from-master.merge > actual &&
|
|
|
|
git config branch.from-master2.merge > actual2 &&
|
2017-08-17 05:54:24 +03:00
|
|
|
git branch --set-upstream-to follower from-master &&
|
2011-08-19 15:45:43 +04:00
|
|
|
git config branch.from-master.merge > expect &&
|
|
|
|
test_cmp expect2 actual2 &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2008-07-03 23:09:48 +04:00
|
|
|
test_done
|