diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2012-11-18 10:09:55 +0400 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2012-11-28 23:00:07 +0400 |
| commit | 37849a8ec3aba526570f73f90bccb232ceefc426 (patch) | |
| tree | 099257ccee1b4224170f972aec7ad47867ac0ca3 /tests-clar/resources | |
| parent | f1bd50d61d3bce63b8db46e906b2ed34ec9545cf (diff) | |
tracking: fix retrieval of the tracking ref of branch with empty merge and/or remote entry
Diffstat (limited to 'tests-clar/resources')
| -rw-r--r-- | tests-clar/resources/testrepo.git/config | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests-clar/resources/testrepo.git/config b/tests-clar/resources/testrepo.git/config index 3801ce08d..904a4e3f3 100644 --- a/tests-clar/resources/testrepo.git/config +++ b/tests-clar/resources/testrepo.git/config @@ -25,3 +25,12 @@ [branch "cannot-fetch"] remote = joshaber merge = refs/heads/cannot-fetch +[branch "remoteless"] + remote = + merge = refs/heads/master +[branch "mergeless"] + remote = test + merge = +[branch "mergeandremoteless"] + remote = + merge = |