diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-18 20:01:06 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-18 20:01:06 +0400 |
| commit | 36587681b4743c980e4e74a342dc5ec105314d08 (patch) | |
| tree | 35f0267f12def071aadef8de84e257f606794135 /builtin-rerere.c | |
| parent | f2a56171accb4fec03a30e513702283ab90088a1 (diff) | |
| parent | f6a5f1bb509a3af182fe568135398f1f2be15e5d (diff) | |
Merge branch 'ar/unlink-err'
* ar/unlink-err:
print unlink(2) errno in copy_or_link_directory
replace direct calls to unlink(2) with unlink_or_warn
Introduce an unlink(2) wrapper which gives warning if unlink failed
Diffstat (limited to 'builtin-rerere.c')
| -rw-r--r-- | builtin-rerere.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c index 020af7377b..adfb7b5f48 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -116,7 +116,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix) if (!has_rerere_resolution(name)) unlink_rr_item(name); } - unlink(git_path("rr-cache/MERGE_RR")); + unlink_or_warn(git_path("rr-cache/MERGE_RR")); } else if (!strcmp(argv[1], "gc")) garbage_collect(&merge_rr); else if (!strcmp(argv[1], "status")) |