diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-18 09:01:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-18 09:01:06 -0700 |
| commit | 36587681b4743c980e4e74a342dc5ec105314d08 (patch) | |
| tree | 35f0267f12def071aadef8de84e257f606794135 /builtin-prune-packed.c | |
| parent | f2a56171accb4fec03a30e513702283ab90088a1 (diff) | |
| parent | f6a5f1bb509a3af182fe568135398f1f2be15e5d (diff) | |
| download | git-36587681b4743c980e4e74a342dc5ec105314d08.tar.gz | |
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-prune-packed.c')
| -rw-r--r-- | builtin-prune-packed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c index 4942892e9f..00590b1c3c 100644 --- a/builtin-prune-packed.c +++ b/builtin-prune-packed.c @@ -28,8 +28,8 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts) memcpy(pathname + len, de->d_name, 38); if (opts & DRY_RUN) printf("rm -f %s\n", pathname); - else if (unlink(pathname) < 0) - error("unable to unlink %s", pathname); + else + unlink_or_warn(pathname); display_progress(progress, i + 1); } pathname[len] = 0; |