diff options
| author | Olivier Marin <dkr@freesurf.fr> | 2008-06-10 16:51:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-10 22:30:01 -0700 |
| commit | 0ecfcb3b700e7e3097a55f015894ad75f1097090 (patch) | |
| tree | ddf0505acd318b58dfc6dcbd9dfecc3c9a3d83e4 /t/t5505-remote.sh | |
| parent | ea81e10ff4e31820407f4cb1b8ebd87de9e51737 (diff) | |
| download | git-0ecfcb3b700e7e3097a55f015894ad75f1097090.tar.gz git-0ecfcb3b700e7e3097a55f015894ad75f1097090.tar.xz | |
remote show: fix the -n option
The perl version accepted a -n flag, to show local informations only
without querying remote heads, that seems to have been lost in the C
revrite.
This restores the older behaviour and add a test case.
Signed-off-by: Olivier Marin <dkr@freesurf.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5505-remote.sh')
| -rwxr-xr-x | t/t5505-remote.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 0d7ed1f99..c6a7bfb44 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -138,6 +138,23 @@ test_expect_success 'show' ' test_cmp expect output) ' +cat > test/expect << EOF +* remote origin + URL: $(pwd)/one/.git + Remote branch merged with 'git pull' while on branch master + master + Local branches pushed with 'git push' + master:upstream +refs/tags/lastbackup +EOF + +test_expect_success 'show -n' ' + (mv one one.unreachable && + cd test && + git remote show -n origin > output && + mv ../one.unreachable ../one && + test_cmp expect output) +' + test_expect_success 'prune' ' (cd one && git branch -m side side2) && |