diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-03-27 13:03:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-27 13:03:56 -0700 |
| commit | b88605f6d4b2b1b8dd805da9e91feccb68b4c840 (patch) | |
| tree | 8dd5d794d7c61220ef9c7055f1fdf18f71f6b1a5 /t/t5515/refs.br-config-glob-merge_config-glob | |
| parent | Documentation: clarify use of .git{ignore,attributes} versus .git/info/* (diff) | |
| parent | git-fetch test: test tracking fetch results, not just FETCH_HEAD (diff) | |
| download | tgif-b88605f6d4b2b1b8dd805da9e91feccb68b4c840.tar.xz | |
Merge branch 'jc/maint-fetch-regression-1.5.4' into maint
* jc/maint-fetch-regression-1.5.4:
git-fetch test: test tracking fetch results, not just FETCH_HEAD
Fix branches file configuration
Tighten refspec processing
Diffstat (limited to 't/t5515/refs.br-config-glob-merge_config-glob')
| -rw-r--r-- | t/t5515/refs.br-config-glob-merge_config-glob | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t5515/refs.br-config-glob-merge_config-glob b/t/t5515/refs.br-config-glob-merge_config-glob new file mode 100644 index 0000000000..9bbbfd9fc5 --- /dev/null +++ b/t/t5515/refs.br-config-glob-merge_config-glob @@ -0,0 +1,15 @@ +0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD +754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master +8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one +0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three +6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two +754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master +8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one +0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three +6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two +6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master +8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one +22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree +c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three +0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file +525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two |