diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-05 13:40:49 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-05 13:40:49 -0400 |
| commit | 348dec0551c5dfdf7734a4adf0196d576593ae28 (patch) | |
| tree | 585932c41eebeb40b8ad3ded8a54de159dff1024 /Git | |
| parent | 492691812af4cab81c21ae98cd47f97dbf4cda76 (diff) | |
sync: Fix an edge case where syncing in a bare repository would try to merge and so fail.
In the case where a remote of the bare repo has a fetch = configuration,
refs/remotes/origin/master will exist, and so the merge code path tried to
run in the bare repo.
Diffstat (limited to 'Git')
0 files changed, 0 insertions, 0 deletions