diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-19 01:28:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-19 01:28:47 -0700 |
| commit | 3b463c3f02f83ef0bce2d5daa193459418e5258f (patch) | |
| tree | b9be594d708d5a343deece2f9f572f852e40bab7 /git-merge-resolve.sh | |
| parent | a9cb3c6ecb97c4734423045f47899e03f135d3bd (diff) | |
| download | git-3b463c3f02f83ef0bce2d5daa193459418e5258f.tar.gz | |
ref-log: fix D/F conflict coming from deleted refs.
After deleting a branch l/k, you should be able to create a
branch l. Earlier we added remove_empty_directories() on the
ref creation side to remove leftover .git/refs/l directory but
we also need a matching code to remove .git/logs/refs/l
directory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions