kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rr/remote-branch-config-refresh' 

The original way to specify remote repository using .git/branches/
used to have a nifty feature.  The code to support the feature was
still in a function but the caller was changed not to call it 5
years ago, breaking that feature and leaving the supporting code
unreachable.

* rr/remote-branch-config-refresh:
  t/t5505-remote: test multiple push/pull in remotes-file
  ls-remote doc: don't encourage use of branches-file
  ls-remote doc: rewrite <repository> paragraph
  ls-remote doc: fix example invocation on git.git
  t/t5505-remote: test url-with-# in branches-file
  remote: remove dead code in read_branches_file()
  t/t5505-remote: use test_path_is_missing
  t/t5505-remote: test push-refspec in branches-file
  t/t5505-remote: modernize style
maint
Junio C Hamano 2013-07-01 12:41:58 -07:00
parent 46b045917c f0f249d186
commit 7e5ad06f68
3 changed files with 485 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/git-ls-remote.txt
View File

@ -48,9 +48,9 @@ OPTIONS
exit without talking to the remote. exit without talking to the remote.


<repository>:: <repository>::
Location of the repository. The shorthand defined in The "remote" repository to query. This parameter can be
$GIT_DIR/branches/ can be used. Use "." (dot) to list references in either a URL or the name of a remote (see the GIT URLS and
the local repository. REMOTES sections of linkgit:git-fetch[1]).


<refs>...:: <refs>...::
When unspecified, all references, after filtering done When unspecified, all references, after filtering done
@ -70,9 +70,8 @@ EXAMPLES
$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc $ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master 5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master
c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu
b1d096f2926c4e37c9c0b6a7bf2119bedaa277cb refs/heads/rc $ git remote add korg http://www.kernel.org/pub/scm/git/git.git
$ echo http://www.kernel.org/pub/scm/git/git.git >.git/branches/public $ git ls-remote --tags korg v\*
$ git ls-remote --tags public v\*
d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99 d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99
f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1 f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1
c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2

21
remote.c
View File

@ -276,10 +276,9 @@ static void read_remotes_file(struct remote *remote)


static void read_branches_file(struct remote *remote) static void read_branches_file(struct remote *remote)
{ {
const char *slash = strchr(remote->name, '/');
char *frag; char *frag;
struct strbuf branch = STRBUF_INIT; struct strbuf branch = STRBUF_INIT;
int n = slash ? slash - remote->name : 1000; int n = 1000;
FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r"); FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r");
char *s, *p; char *s, *p;
int len; int len;
@ -299,21 +298,11 @@ static void read_branches_file(struct remote *remote)
while (isspace(p[-1])) while (isspace(p[-1]))
*--p = 0; *--p = 0;
len = p - s; len = p - s;
if (slash)
len += strlen(slash);
p = xmalloc(len + 1); p = xmalloc(len + 1);
strcpy(p, s); strcpy(p, s);
if (slash)
strcat(p, slash);


/* /*
* With "slash", e.g. "git fetch jgarzik/netdev-2.6" when * The branches file would have URL and optionally
* reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
* the partial URL obtained from the branches file plus
* "/netdev-2.6" and does not store it in any tracking ref.
* #branch specifier in the file is ignored.
*
* Otherwise, the branches file would have URL and optionally
* #branch specified. The "master" (or specified) branch is * #branch specified. The "master" (or specified) branch is
* fetched and stored in the local branch of the same name. * fetched and stored in the local branch of the same name.
*/ */
@ -323,12 +312,8 @@ static void read_branches_file(struct remote *remote)
strbuf_addf(&branch, "refs/heads/%s", frag); strbuf_addf(&branch, "refs/heads/%s", frag);
} else } else
strbuf_addstr(&branch, "refs/heads/master"); strbuf_addstr(&branch, "refs/heads/master");
if (!slash) {
strbuf_addf(&branch, ":refs/heads/%s", remote->name); strbuf_addf(&branch, ":refs/heads/%s", remote->name);
} else {
strbuf_reset(&branch);
strbuf_addstr(&branch, "HEAD:");
}
add_url_alias(remote, p); add_url_alias(remote, p);
add_fetch_refspec(remote, strbuf_detach(&branch, NULL)); add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
/* /*

366
t/t5505-remote.sh
View File

@ -42,14 +42,13 @@ check_tracking_branch () {
} }


test_expect_success setup ' test_expect_success setup '

setup_repository one && setup_repository one &&
setup_repository two && setup_repository two &&
( (
cd two && git branch another cd two &&
git branch another
) && ) &&
git clone one test git clone one test

' '


test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' ' test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '
@ -116,19 +115,17 @@ test_expect_success C_LOCALE_OUTPUT 'remove remote' '
test_expect_success 'remove remote protects local branches' ' test_expect_success 'remove remote protects local branches' '
( (
cd test && cd test &&
{ cat >expect1 <<EOF cat >expect1 <<-\EOF &&
Note: A branch outside the refs/remotes/ hierarchy was not removed; Note: A branch outside the refs/remotes/ hierarchy was not removed;
to delete it, use: to delete it, use:
git branch -d master git branch -d master
EOF EOF
} && cat >expect2 <<-\EOF &&
{ cat >expect2 <<EOF
Note: Some branches outside the refs/remotes/ hierarchy were not removed; Note: Some branches outside the refs/remotes/ hierarchy were not removed;
to delete them, use: to delete them, use:
git branch -d foobranch git branch -d foobranch
git branch -d master git branch -d master
EOF EOF
} &&
git tag footag && git tag footag &&
git config --add remote.oops.fetch "+refs/*:refs/*" && git config --add remote.oops.fetch "+refs/*:refs/*" &&
git remote remove oops 2>actual1 && git remote remove oops 2>actual1 &&
@ -172,7 +169,8 @@ cat > test/expect << EOF
EOF EOF


test_expect_success 'show' ' test_expect_success 'show' '
(cd test && (
cd test &&
git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream && git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
git fetch && git fetch &&
git checkout -b ahead origin/master && git checkout -b ahead origin/master &&
@ -187,10 +185,12 @@ test_expect_success 'show' '
git config --add remote.two.pushurl ../three && git config --add remote.two.pushurl ../three &&
git config branch.rebase.rebase true && git config branch.rebase.rebase true &&
git config branch.octopus.merge "topic-a topic-b topic-c" && git config branch.octopus.merge "topic-a topic-b topic-c" &&
(cd ../one && (
cd ../one &&
echo 1 >file && echo 1 >file &&
test_tick && test_tick &&
git commit -m update file) && git commit -m update file
) &&
git config --add remote.origin.push : && git config --add remote.origin.push : &&
git config --add remote.origin.push refs/heads/master:refs/heads/upstream && git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
git config --add remote.origin.push +refs/tags/lastbackup && git config --add remote.origin.push +refs/tags/lastbackup &&
@ -198,7 +198,8 @@ test_expect_success 'show' '
git config --add remote.two.push refs/heads/master:refs/heads/another && git config --add remote.two.push refs/heads/master:refs/heads/another &&
git remote show origin two >output && git remote show origin two >output &&
git branch -d rebase octopus && git branch -d rebase octopus &&
test_i18ncmp expect output) test_i18ncmp expect output
)
' '


cat >test/expect <<EOF cat >test/expect <<EOF
@ -219,32 +220,41 @@ cat > test/expect << EOF
EOF EOF


test_expect_success 'show -n' ' test_expect_success 'show -n' '
(mv one one.unreachable && mv one one.unreachable &&
(
cd test && cd test &&
git remote show -n origin >output && git remote show -n origin >output &&
mv ../one.unreachable ../one && mv ../one.unreachable ../one &&
test_i18ncmp expect output) test_i18ncmp expect output
)
' '


test_expect_success 'prune' ' test_expect_success 'prune' '
(cd one && (
git branch -m side side2) && cd one &&
(cd test && git branch -m side side2
) &&
(
cd test &&
git fetch origin && git fetch origin &&
git remote prune origin && git remote prune origin &&
git rev-parse refs/remotes/origin/side2 && git rev-parse refs/remotes/origin/side2 &&
test_must_fail git rev-parse refs/remotes/origin/side) test_must_fail git rev-parse refs/remotes/origin/side
)
' '


test_expect_success 'set-head --delete' ' test_expect_success 'set-head --delete' '
(cd test && (
cd test &&
git symbolic-ref refs/remotes/origin/HEAD && git symbolic-ref refs/remotes/origin/HEAD &&
git remote set-head --delete origin && git remote set-head --delete origin &&
test_must_fail git symbolic-ref refs/remotes/origin/HEAD) test_must_fail git symbolic-ref refs/remotes/origin/HEAD
)
' '


test_expect_success 'set-head --auto' ' test_expect_success 'set-head --auto' '
(cd test && (
cd test &&
git remote set-head --auto origin && git remote set-head --auto origin &&
echo refs/remotes/origin/master >expect && echo refs/remotes/origin/master >expect &&
git symbolic-ref refs/remotes/origin/HEAD >output && git symbolic-ref refs/remotes/origin/HEAD >output &&
@ -252,28 +262,32 @@ test_expect_success 'set-head --auto' '
) )
' '


cat >test/expect <<EOF cat >test/expect <<\EOF
error: Multiple remote HEAD branches. Please choose one explicitly with: error: Multiple remote HEAD branches. Please choose one explicitly with:
git remote set-head two another git remote set-head two another
git remote set-head two master git remote set-head two master
EOF EOF


test_expect_success 'set-head --auto fails w/multiple HEADs' ' test_expect_success 'set-head --auto fails w/multiple HEADs' '
(cd test && (
cd test &&
test_must_fail git remote set-head --auto two >output 2>&1 && test_must_fail git remote set-head --auto two >output 2>&1 &&
test_i18ncmp expect output) test_i18ncmp expect output
)
' '


cat >test/expect <<EOF cat >test/expect <<\EOF
refs/remotes/origin/side2 refs/remotes/origin/side2
EOF EOF


test_expect_success 'set-head explicit' ' test_expect_success 'set-head explicit' '
(cd test && (
cd test &&
git remote set-head origin side2 && git remote set-head origin side2 &&
git symbolic-ref refs/remotes/origin/HEAD >output && git symbolic-ref refs/remotes/origin/HEAD >output &&
git remote set-head origin master && git remote set-head origin master &&
test_cmp expect output) test_cmp expect output
)
' '


cat >test/expect <<EOF cat >test/expect <<EOF
@ -283,49 +297,65 @@ URL: $(pwd)/one
EOF EOF


test_expect_success 'prune --dry-run' ' test_expect_success 'prune --dry-run' '
(cd one && (
cd one &&
git branch -m side2 side) && git branch -m side2 side) &&
(cd test && (
cd test &&
git remote prune --dry-run origin >output && git remote prune --dry-run origin >output &&
git rev-parse refs/remotes/origin/side2 && git rev-parse refs/remotes/origin/side2 &&
test_must_fail git rev-parse refs/remotes/origin/side && test_must_fail git rev-parse refs/remotes/origin/side &&
(cd ../one && (
cd ../one &&
git branch -m side side2) && git branch -m side side2) &&
test_i18ncmp expect output) test_i18ncmp expect output
)
' '


test_expect_success 'add --mirror && prune' ' test_expect_success 'add --mirror && prune' '
(mkdir mirror && mkdir mirror &&
(
cd mirror && cd mirror &&
git init --bare && git init --bare &&
git remote add --mirror -f origin ../one) && git remote add --mirror -f origin ../one
(cd one && ) &&
git branch -m side2 side) && (
(cd mirror && cd one &&
git branch -m side2 side
) &&
(
cd mirror &&
git rev-parse --verify refs/heads/side2 && git rev-parse --verify refs/heads/side2 &&
test_must_fail git rev-parse --verify refs/heads/side && test_must_fail git rev-parse --verify refs/heads/side &&
git fetch origin && git fetch origin &&
git remote prune origin && git remote prune origin &&
test_must_fail git rev-parse --verify refs/heads/side2 && test_must_fail git rev-parse --verify refs/heads/side2 &&
git rev-parse --verify refs/heads/side) git rev-parse --verify refs/heads/side
)
' '


test_expect_success 'add --mirror=fetch' ' test_expect_success 'add --mirror=fetch' '
mkdir mirror-fetch && mkdir mirror-fetch &&
git init mirror-fetch/parent && git init mirror-fetch/parent &&
(cd mirror-fetch/parent && (
test_commit one) && cd mirror-fetch/parent &&
test_commit one
) &&
git init --bare mirror-fetch/child && git init --bare mirror-fetch/child &&
(cd mirror-fetch/child && (
git remote add --mirror=fetch -f parent ../parent) cd mirror-fetch/child &&
git remote add --mirror=fetch -f parent ../parent
)
' '


test_expect_success 'fetch mirrors act as mirrors during fetch' ' test_expect_success 'fetch mirrors act as mirrors during fetch' '
(cd mirror-fetch/parent && (
cd mirror-fetch/parent &&
git branch new && git branch new &&
git branch -m master renamed git branch -m master renamed
) && ) &&
(cd mirror-fetch/child && (
cd mirror-fetch/child &&
git fetch parent && git fetch parent &&
git rev-parse --verify refs/heads/new && git rev-parse --verify refs/heads/new &&
git rev-parse --verify refs/heads/renamed git rev-parse --verify refs/heads/renamed
@ -333,21 +363,25 @@ test_expect_success 'fetch mirrors act as mirrors during fetch' '
' '


test_expect_success 'fetch mirrors can prune' ' test_expect_success 'fetch mirrors can prune' '
(cd mirror-fetch/child && (
cd mirror-fetch/child &&
git remote prune parent && git remote prune parent &&
test_must_fail git rev-parse --verify refs/heads/master test_must_fail git rev-parse --verify refs/heads/master
) )
' '


test_expect_success 'fetch mirrors do not act as mirrors during push' ' test_expect_success 'fetch mirrors do not act as mirrors during push' '
(cd mirror-fetch/parent && (
cd mirror-fetch/parent &&
git checkout HEAD^0 git checkout HEAD^0
) && ) &&
(cd mirror-fetch/child && (
cd mirror-fetch/child &&
git branch -m renamed renamed2 && git branch -m renamed renamed2 &&
git push parent : git push parent :
) && ) &&
(cd mirror-fetch/parent && (
cd mirror-fetch/parent &&
git rev-parse --verify renamed && git rev-parse --verify renamed &&
test_must_fail git rev-parse --verify refs/heads/renamed2 test_must_fail git rev-parse --verify refs/heads/renamed2
) )
@ -355,13 +389,15 @@ test_expect_success 'fetch mirrors do not act as mirrors during push' '


test_expect_success 'add fetch mirror with specific branches' ' test_expect_success 'add fetch mirror with specific branches' '
git init --bare mirror-fetch/track && git init --bare mirror-fetch/track &&
(cd mirror-fetch/track && (
cd mirror-fetch/track &&
git remote add --mirror=fetch -t heads/new parent ../parent git remote add --mirror=fetch -t heads/new parent ../parent
) )
' '


test_expect_success 'fetch mirror respects specific branches' ' test_expect_success 'fetch mirror respects specific branches' '
(cd mirror-fetch/track && (
cd mirror-fetch/track &&
git fetch parent && git fetch parent &&
git rev-parse --verify refs/heads/new && git rev-parse --verify refs/heads/new &&
test_must_fail git rev-parse --verify refs/heads/renamed test_must_fail git rev-parse --verify refs/heads/renamed
@ -372,19 +408,22 @@ test_expect_success 'add --mirror=push' '
mkdir mirror-push && mkdir mirror-push &&
git init --bare mirror-push/public && git init --bare mirror-push/public &&
git init mirror-push/private && git init mirror-push/private &&
(cd mirror-push/private && (
cd mirror-push/private &&
test_commit one && test_commit one &&
git remote add --mirror=push public ../public git remote add --mirror=push public ../public
) )
' '


test_expect_success 'push mirrors act as mirrors during push' ' test_expect_success 'push mirrors act as mirrors during push' '
(cd mirror-push/private && (
cd mirror-push/private &&
git branch new && git branch new &&
git branch -m master renamed && git branch -m master renamed &&
git push public git push public
) && ) &&
(cd mirror-push/private && (
cd mirror-push/private &&
git rev-parse --verify refs/heads/new && git rev-parse --verify refs/heads/new &&
git rev-parse --verify refs/heads/renamed && git rev-parse --verify refs/heads/renamed &&
test_must_fail git rev-parse --verify refs/heads/master test_must_fail git rev-parse --verify refs/heads/master
@ -392,11 +431,13 @@ test_expect_success 'push mirrors act as mirrors during push' '
' '


test_expect_success 'push mirrors do not act as mirrors during fetch' ' test_expect_success 'push mirrors do not act as mirrors during fetch' '
(cd mirror-push/public && (
cd mirror-push/public &&
git branch -m renamed renamed2 && git branch -m renamed renamed2 &&
git symbolic-ref HEAD refs/heads/renamed2 git symbolic-ref HEAD refs/heads/renamed2
) && ) &&
(cd mirror-push/private && (
cd mirror-push/private &&
git fetch public && git fetch public &&
git rev-parse --verify refs/heads/renamed && git rev-parse --verify refs/heads/renamed &&
test_must_fail git rev-parse --verify refs/heads/renamed2 test_must_fail git rev-parse --verify refs/heads/renamed2
@ -405,27 +446,34 @@ test_expect_success 'push mirrors do not act as mirrors during fetch' '


test_expect_success 'push mirrors do not allow you to specify refs' ' test_expect_success 'push mirrors do not allow you to specify refs' '
git init mirror-push/track && git init mirror-push/track &&
(cd mirror-push/track && (
cd mirror-push/track &&
test_must_fail git remote add --mirror=push -t new public ../public test_must_fail git remote add --mirror=push -t new public ../public
) )
' '


test_expect_success 'add alt && prune' ' test_expect_success 'add alt && prune' '
(mkdir alttst && mkdir alttst &&
(
cd alttst && cd alttst &&
git init && git init &&
git remote add -f origin ../one && git remote add -f origin ../one &&
git config remote.alt.url ../one && git config remote.alt.url ../one &&
git config remote.alt.fetch "+refs/heads/*:refs/remotes/origin/*") && git config remote.alt.fetch "+refs/heads/*:refs/remotes/origin/*"
(cd one && ) &&
git branch -m side side2) && (
(cd alttst && cd one &&
git branch -m side side2
) &&
(
cd alttst &&
git rev-parse --verify refs/remotes/origin/side && git rev-parse --verify refs/remotes/origin/side &&
test_must_fail git rev-parse --verify refs/remotes/origin/side2 && test_must_fail git rev-parse --verify refs/remotes/origin/side2 &&
git fetch alt && git fetch alt &&
git remote prune alt && git remote prune alt &&
test_must_fail git rev-parse --verify refs/remotes/origin/side && test_must_fail git rev-parse --verify refs/remotes/origin/side &&
git rev-parse --verify refs/remotes/origin/side2) git rev-parse --verify refs/remotes/origin/side2
)
' '


cat >test/expect <<\EOF cat >test/expect <<\EOF
@ -433,20 +481,24 @@ some-tag
EOF EOF


test_expect_success 'add with reachable tags (default)' ' test_expect_success 'add with reachable tags (default)' '
(cd one && (
cd one &&
>foobar && >foobar &&
git add foobar && git add foobar &&
git commit -m "Foobar" && git commit -m "Foobar" &&
git tag -a -m "Foobar tag" foobar-tag && git tag -a -m "Foobar tag" foobar-tag &&
git reset --hard HEAD~1 && git reset --hard HEAD~1 &&
git tag -a -m "Some tag" some-tag) && git tag -a -m "Some tag" some-tag
(mkdir add-tags && ) &&
mkdir add-tags &&
(
cd add-tags && cd add-tags &&
git init && git init &&
git remote add -f origin ../one && git remote add -f origin ../one &&
git tag -l some-tag >../test/output && git tag -l some-tag >../test/output &&
git tag -l foobar-tag >>../test/output && git tag -l foobar-tag >>../test/output &&
test_must_fail git config remote.origin.tagopt) && test_must_fail git config remote.origin.tagopt
) &&
test_cmp test/expect test/output test_cmp test/expect test/output
' '


@ -457,14 +509,16 @@ foobar-tag
EOF EOF


test_expect_success 'add --tags' ' test_expect_success 'add --tags' '
(rm -rf add-tags && rm -rf add-tags &&
(
mkdir add-tags && mkdir add-tags &&
cd add-tags && cd add-tags &&
git init && git init &&
git remote add -f --tags origin ../one && git remote add -f --tags origin ../one &&
git tag -l some-tag >../test/output && git tag -l some-tag >../test/output &&
git tag -l foobar-tag >>../test/output && git tag -l foobar-tag >>../test/output &&
git config remote.origin.tagopt >>../test/output) && git config remote.origin.tagopt >>../test/output
) &&
test_cmp test/expect test/output test_cmp test/expect test/output
' '


@ -473,25 +527,31 @@ cat >test/expect <<\EOF
EOF EOF


test_expect_success 'add --no-tags' ' test_expect_success 'add --no-tags' '
(rm -rf add-tags && rm -rf add-tags &&
(
mkdir add-no-tags && mkdir add-no-tags &&
cd add-no-tags && cd add-no-tags &&
git init && git init &&
git remote add -f --no-tags origin ../one && git remote add -f --no-tags origin ../one &&
git tag -l some-tag >../test/output && git tag -l some-tag >../test/output &&
git tag -l foobar-tag >../test/output && git tag -l foobar-tag >../test/output &&
git config remote.origin.tagopt >>../test/output) && git config remote.origin.tagopt >>../test/output
(cd one && ) &&
git tag -d some-tag foobar-tag) && (
cd one &&
git tag -d some-tag foobar-tag
) &&
test_cmp test/expect test/output test_cmp test/expect test/output
' '


test_expect_success 'reject --no-no-tags' ' test_expect_success 'reject --no-no-tags' '
(cd add-no-tags && (
test_must_fail git remote add -f --no-no-tags neworigin ../one) cd add-no-tags &&
test_must_fail git remote add -f --no-no-tags neworigin ../one
)
' '


cat > one/expect << EOF cat >one/expect <<\EOF
apis/master apis/master
apis/side apis/side
drosophila/another drosophila/another
@ -500,17 +560,17 @@ cat > one/expect << EOF
EOF EOF


test_expect_success 'update' ' test_expect_success 'update' '

(
(cd one && cd one &&
git remote add drosophila ../two && git remote add drosophila ../two &&
git remote add apis ../mirror && git remote add apis ../mirror &&
git remote update && git remote update &&
git branch -r >output && git branch -r >output &&
test_cmp expect output) test_cmp expect output

)
' '


cat > one/expect << EOF cat >one/expect <<\EOF
drosophila/another drosophila/another
drosophila/master drosophila/master
drosophila/side drosophila/side
@ -521,8 +581,8 @@ cat > one/expect << EOF
EOF EOF


test_expect_success 'update with arguments' ' test_expect_success 'update with arguments' '

(
(cd one && cd one &&
for b in $(git branch -r) for b in $(git branch -r)
do do
git branch -r -d $b || break git branch -r -d $b || break
@ -533,22 +593,28 @@ test_expect_success 'update with arguments' '
git config remotes.titanus manduca && git config remotes.titanus manduca &&
git remote update phobaeticus titanus && git remote update phobaeticus titanus &&
git branch -r >output && git branch -r >output &&
test_cmp expect output) test_cmp expect output

)
' '


test_expect_success 'update --prune' ' test_expect_success 'update --prune' '

(
(cd one && cd one &&
git branch -m side2 side3) && git branch -m side2 side3
(cd test && ) &&
(
cd test &&
git remote update --prune && git remote update --prune &&
(cd ../one && git branch -m side3 side2) && (
cd ../one &&
git branch -m side3 side2
) &&
git rev-parse refs/remotes/origin/side3 && git rev-parse refs/remotes/origin/side3 &&
test_must_fail git rev-parse refs/remotes/origin/side2) test_must_fail git rev-parse refs/remotes/origin/side2
)
' '


cat > one/expect << EOF cat >one/expect <<-\EOF
apis/master apis/master
apis/side apis/side
manduca/master manduca/master
@ -558,8 +624,8 @@ cat > one/expect << EOF
EOF EOF


test_expect_success 'update default' ' test_expect_success 'update default' '

(
(cd one && cd one &&
for b in $(git branch -r) for b in $(git branch -r)
do do
git branch -r -d $b || break git branch -r -d $b || break
@ -567,19 +633,19 @@ test_expect_success 'update default' '
git config remote.drosophila.skipDefaultUpdate true && git config remote.drosophila.skipDefaultUpdate true &&
git remote update default && git remote update default &&
git branch -r >output && git branch -r >output &&
test_cmp expect output) test_cmp expect output

)
' '


cat > one/expect << EOF cat >one/expect <<\EOF
drosophila/another drosophila/another
drosophila/master drosophila/master
drosophila/side drosophila/side
EOF EOF


test_expect_success 'update default (overridden, with funny whitespace)' ' test_expect_success 'update default (overridden, with funny whitespace)' '

(
(cd one && cd one &&
for b in $(git branch -r) for b in $(git branch -r)
do do
git branch -r -d $b || break git branch -r -d $b || break
@ -587,13 +653,13 @@ test_expect_success 'update default (overridden, with funny whitespace)' '
git config remotes.default "$(printf "\t drosophila \n")" && git config remotes.default "$(printf "\t drosophila \n")" &&
git remote update default && git remote update default &&
git branch -r >output && git branch -r >output &&
test_cmp expect output) test_cmp expect output

)
' '


test_expect_success 'update (with remotes.default defined)' ' test_expect_success 'update (with remotes.default defined)' '

(
(cd one && cd one &&
for b in $(git branch -r) for b in $(git branch -r)
do do
git branch -r -d $b || break git branch -r -d $b || break
@ -601,133 +667,161 @@ test_expect_success 'update (with remotes.default defined)' '
git config remotes.default "drosophila" && git config remotes.default "drosophila" &&
git remote update && git remote update &&
git branch -r >output && git branch -r >output &&
test_cmp expect output) test_cmp expect output

)
' '


test_expect_success '"remote show" does not show symbolic refs' ' test_expect_success '"remote show" does not show symbolic refs' '

git clone one three && git clone one three &&
(cd three && (
cd three &&
git remote show origin >output && git remote show origin >output &&
! grep "^ *HEAD$" < output && ! grep "^ *HEAD$" < output &&
! grep -i stale < output) ! grep -i stale < output

)
' '


test_expect_success 'reject adding remote with an invalid name' ' test_expect_success 'reject adding remote with an invalid name' '

test_must_fail git remote add some:url desired-name test_must_fail git remote add some:url desired-name

' '


# The first three test if the tracking branches are properly renamed, # The first three test if the tracking branches are properly renamed,
# the last two ones check if the config is updated. # the last two ones check if the config is updated.


test_expect_success 'rename a remote' ' test_expect_success 'rename a remote' '

git clone one four && git clone one four &&
(cd four && (
cd four &&
git remote rename origin upstream && git remote rename origin upstream &&
rmdir .git/refs/remotes/origin && rmdir .git/refs/remotes/origin &&
test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" && test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" && test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" && test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
test "$(git config branch.master.remote)" = "upstream") test "$(git config branch.master.remote)" = "upstream"

)
' '


test_expect_success 'rename does not update a non-default fetch refspec' ' test_expect_success 'rename does not update a non-default fetch refspec' '

git clone one four.one && git clone one four.one &&
(cd four.one && (
cd four.one &&
git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* && git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
git remote rename origin upstream && git remote rename origin upstream &&
test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" && test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
git rev-parse -q origin/master) git rev-parse -q origin/master

)
' '


test_expect_success 'rename a remote with name part of fetch spec' ' test_expect_success 'rename a remote with name part of fetch spec' '

git clone one four.two && git clone one four.two &&
(cd four.two && (
cd four.two &&
git remote rename origin remote && git remote rename origin remote &&
git remote rename remote upstream && git remote rename remote upstream &&
test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*") test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*"

)
' '


test_expect_success 'rename a remote with name prefix of other remote' ' test_expect_success 'rename a remote with name prefix of other remote' '

git clone one four.three && git clone one four.three &&
(cd four.three && (
cd four.three &&
git remote add o git://example.com/repo.git && git remote add o git://example.com/repo.git &&
git remote rename o upstream && git remote rename o upstream &&
test "$(git rev-parse origin/master)" = "$(git rev-parse master)") test "$(git rev-parse origin/master)" = "$(git rev-parse master)"

)
' '


cat >remotes_origin <<EOF cat >remotes_origin <<EOF
URL: $(pwd)/one URL: $(pwd)/one
Push: refs/heads/master:refs/heads/upstream Push: refs/heads/master:refs/heads/upstream
Push: refs/heads/next:refs/heads/upstream2
Pull: refs/heads/master:refs/heads/origin Pull: refs/heads/master:refs/heads/origin
Pull: refs/heads/next:refs/heads/origin2
EOF EOF


test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' ' test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
git clone one five && git clone one five &&
origin_url=$(pwd)/one && origin_url=$(pwd)/one &&
(cd five && (
cd five &&
git remote remove origin && git remote remove origin &&
mkdir -p .git/remotes && mkdir -p .git/remotes &&
cat ../remotes_origin >.git/remotes/origin && cat ../remotes_origin >.git/remotes/origin &&
git remote rename origin origin && git remote rename origin origin &&
! test -f .git/remotes/origin && test_path_is_missing .git/remotes/origin &&
test "$(git config remote.origin.url)" = "$origin_url" && test "$(git config remote.origin.url)" = "$origin_url" &&
test "$(git config remote.origin.push)" = "refs/heads/master:refs/heads/upstream" && cat >push_expected <<-\EOF &&
test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin") refs/heads/master:refs/heads/upstream
refs/heads/next:refs/heads/upstream2
EOF
cat >fetch_expected <<-\EOF &&
refs/heads/master:refs/heads/origin
refs/heads/next:refs/heads/origin2
EOF
git config --get-all remote.origin.push >push_actual &&
git config --get-all remote.origin.fetch >fetch_actual &&
test_cmp push_expected push_actual &&
test_cmp fetch_expected fetch_actual
)
' '


test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' ' test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
git clone one six && git clone one six &&
origin_url=$(pwd)/one && origin_url=$(pwd)/one &&
(cd six && (
cd six &&
git remote rm origin && git remote rm origin &&
echo "$origin_url" >.git/branches/origin && echo "$origin_url" >.git/branches/origin &&
git remote rename origin origin && git remote rename origin origin &&
! test -f .git/branches/origin && test_path_is_missing .git/branches/origin &&
test "$(git config remote.origin.url)" = "$origin_url" && test "$(git config remote.origin.url)" = "$origin_url" &&
test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin") test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin" &&
test "$(git config remote.origin.push)" = "HEAD:refs/heads/master"
)
'

test_expect_success 'migrate a remote from named file in $GIT_DIR/branches (2)' '
git clone one seven &&
(
cd seven &&
git remote rm origin &&
echo "quux#foom" > .git/branches/origin &&
git remote rename origin origin &&
test_path_is_missing .git/branches/origin &&
test "$(git config remote.origin.url)" = "quux" &&
test "$(git config remote.origin.fetch)" = "refs/heads/foom:refs/heads/origin"
test "$(git config remote.origin.push)" = "HEAD:refs/heads/foom"
)
' '


test_expect_success 'remote prune to cause a dangling symref' ' test_expect_success 'remote prune to cause a dangling symref' '
git clone one seven && git clone one eight &&
( (
cd one && cd one &&
git checkout side2 && git checkout side2 &&
git branch -D master git branch -D master
) && ) &&
( (
cd seven && cd eight &&
git remote prune origin git remote prune origin
) >err 2>&1 && ) >err 2>&1 &&
test_i18ngrep "has become dangling" err && test_i18ngrep "has become dangling" err &&


: And the dangling symref will not cause other annoying errors && : And the dangling symref will not cause other annoying errors &&
( (
cd seven && cd eight &&
git branch -a git branch -a
) 2>err && ) 2>err &&
! grep "points nowhere" err && ! grep "points nowhere" err &&
( (
cd seven && cd eight &&
test_must_fail git branch nomore origin test_must_fail git branch nomore origin
) 2>err && ) 2>err &&
grep "dangling symref" err grep "dangling symref" err
' '


test_expect_success 'show empty remote' ' test_expect_success 'show empty remote' '

test_create_repo empty && test_create_repo empty &&
git clone empty empty-clone && git clone empty empty-clone &&
( (