undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ref-log: fix D/F conflict coming from deleted refs.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2006-10-19 01:28:47 -07:00
parent a9cb3c6ecb
commit 3b463c3f02
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
refs.c
View File

@ -733,6 +733,16 @@ static int log_ref_write(struct ref_lock *lock,
if (logfd < 0) { if (logfd < 0) {
if (!(oflags & O_CREAT) && errno == ENOENT) if (!(oflags & O_CREAT) && errno == ENOENT)
return 0; return 0;
if ((oflags & O_CREAT) && errno == EISDIR) {
if (remove_empty_directories(lock->log_file)) {
return error("There are still logs under '%s'",
lock->log_file);
}
logfd = open(lock->log_file, oflags, 0666);
}
if (logfd < 0)
return error("Unable to append to %s: %s", return error("Unable to append to %s: %s",
lock->log_file, strerror(errno)); lock->log_file, strerror(errno));
} }

2
t/t3210-pack-refs.sh
View File

@ -11,6 +11,8 @@ semantic is still the same.
' '
. ./test-lib.sh . ./test-lib.sh
echo '[core] logallrefupdates = true' >>.git/config
test_expect_success \ test_expect_success \
'prepare a trivial repository' \ 'prepare a trivial repository' \
'echo Hello > A && 'echo Hello > A &&