diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:57:43 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:57:44 -0700 |
commit | 8a90ddd7055c3659e0e429d319b31bbabb8dc982 (patch) | |
tree | bbd17abb5ad26c62ba28fe7c6c39973ecb729b64 /t | |
parent | 653787aea5cddc9d79dcd1431d1fc76b1e7a6b51 (diff) | |
parent | 0997adaa74dfe07cee3180c3a6fd91949fb4e3d8 (diff) | |
download | git-8a90ddd7055c3659e0e429d319b31bbabb8dc982.tar.gz git-8a90ddd7055c3659e0e429d319b31bbabb8dc982.tar.xz |
Merge branch 'mb/fetch-call-a-non-branch-a-ref'
The report from "git fetch" said "new branch" even for a non branch
ref.
By Marc Branchaud
* mb/fetch-call-a-non-branch-a-ref:
fetch: describe new refs based on where it came from
fetch: Give remote_ref to update_local_ref() as well
Diffstat (limited to 't')
-rwxr-xr-x | t/t5510-fetch.sh | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 308c02ea7..d7a19a182 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -162,6 +162,36 @@ test_expect_success 'fetch following tags' ' ' +test_expect_success 'fetch uses remote ref names to describe new refs' ' + cd "$D" && + git init descriptive && + ( + cd descriptive && + git config remote.o.url .. && + git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" && + git config --add remote.o.fetch "refs/others/*:refs/heads/*" && + git fetch o + ) && + git tag -a -m "Descriptive tag" descriptive-tag && + git branch descriptive-branch && + git checkout descriptive-branch && + echo "Nuts" >crazy && + git add crazy && + git commit -a -m "descriptive commit" && + git update-ref refs/others/crazy HEAD && + ( + cd descriptive && + git fetch o 2>actual && + grep " -> refs/crazyheads/descriptive-branch$" actual | + test_i18ngrep "new branch" && + grep " -> descriptive-tag$" actual | + test_i18ngrep "new tag" && + grep " -> crazy$" actual | + test_i18ngrep "new ref" + ) && + git checkout master +' + test_expect_success 'fetch must not resolve short tag name' ' cd "$D" && |