diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-09 21:37:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 21:37:09 (GMT) |
| commit | eb8aa3d2c2849cb3a44396b89054339df38e2bfa (patch) | |
| tree | 7af351487a380753f89376e78a9c860378d28bfb /t/t5510-fetch.sh | |
| parent | a4043aeafed7962716a513e38ca1d5e192e7e831 (diff) | |
| parent | 96b8d93a539f3a9f43f0fc38214db8753cac3c2e (diff) | |
| download | git-eb8aa3d2c2849cb3a44396b89054339df38e2bfa.zip git-eb8aa3d2c2849cb3a44396b89054339df38e2bfa.tar.gz git-eb8aa3d2c2849cb3a44396b89054339df38e2bfa.tar.bz2 | |
Merge branch 'jc/pull-signed-tag'
* jc/pull-signed-tag:
commit-tree: teach -m/-F options to read logs from elsewhere
commit-tree: update the command line parsing
commit: teach --amend to carry forward extra headers
merge: force edit and no-ff mode when merging a tag object
commit: copy merged signed tags to headers of merge commit
merge: record tag objects without peeling in MERGE_HEAD
merge: make usage of commit->util more extensible
fmt-merge-msg: Add contents of merged tag in the merge message
fmt-merge-msg: package options into a structure
fmt-merge-msg: avoid early returns
refs DWIMmery: use the same rule for both "git fetch" and others
fetch: allow "git fetch $there v1.0" to fetch a tag
merge: notice local merging of tags and keep it unwrapped
fetch: do not store peeled tag object names in FETCH_HEAD
Split GPG interface into its own helper library
Conflicts:
builtin/fmt-merge-msg.c
builtin/merge.c
Diffstat (limited to 't/t5510-fetch.sh')
| -rwxr-xr-x | t/t5510-fetch.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index e0af4c4..e88dbd5 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -166,7 +166,7 @@ test_expect_success 'fetch must not resolve short tag name' ' ' -test_expect_success 'fetch must not resolve short remote name' ' +test_expect_success 'fetch can now resolve short remote name' ' cd "$D" && git update-ref refs/remotes/six/HEAD HEAD && @@ -175,8 +175,7 @@ test_expect_success 'fetch must not resolve short remote name' ' cd six && git init && - test_must_fail git fetch .. six:six - + git fetch .. six:six ' test_expect_success 'create bundle 1' ' |