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

Merge branch 'bc/reflog-fix'

Browse Source 
* bc/reflog-fix:
  builtin-reflog.c: don't install new reflog on write failure
This commit is contained in:
Junio C Hamano 2008-02-27 11:53:48 -08:00
commit 42dd2cd3a3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin-reflog.c
View File

@ -276,10 +276,11 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,
for_each_reflog_ent(ref, expire_reflog_ent, &cb); for_each_reflog_ent(ref, expire_reflog_ent, &cb);
finish: finish:
if (cb.newlog) { if (cb.newlog) {
if (fclose(cb.newlog)) if (fclose(cb.newlog)) {
status |= error("%s: %s", strerror(errno), status |= error("%s: %s", strerror(errno),
newlog_path); newlog_path);
if (rename(newlog_path, log_file)) { unlink(newlog_path);
} else if (rename(newlog_path, log_file)) {
status |= error("cannot rename %s to %s", status |= error("cannot rename %s to %s",
newlog_path, log_file); newlog_path, log_file);
unlink(newlog_path); unlink(newlog_path);