Merge branch 'sb/show-branch-parse-options'

diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c
index 87f46c6d07ccb0f82449b92e33cd4cda76a99da3..6202462216f3b8c3cbe924d4cc002616e69d75ab 100644 (file)
--- a/builtin-fetch-pack.c
+++ b/builtin-fetch-pack.c
@@ -825,7 +825,7 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args,
                fd = hold_lock_file_for_update(&lock, shallow,
                                               LOCK_DIE_ON_ERROR);
                if (!write_shallow_commits(fd, 0)) {
-                       unlink(shallow);
+                       unlink_or_warn(shallow);
                        rollback_lock_file(&lock);
                } else {
                        commit_lock_file(&lock);