diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-16 10:06:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-16 10:06:13 +0300 |
| commit | 90c3302173c5a02189f5fe9091c0d07f7b7ebe89 (patch) | |
| tree | 3488c30e5932a751c344083bfd289c0c48de2ba9 /fast-import.c | |
| parent | 8befc50c49e8a271fd3cd7fb34258fe88d1dfcad (diff) | |
| parent | 87c8a56e4f71cc7e22c16caa4adc2ae17f6aa93d (diff) | |
Merge branch 'maint'
* maint:
fast-import: close pack before unlinking it
pager: do not dup2 stderr if it is already redirected
git-show: do not segfault when showing a bad tag
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 3276d5d7aa..201d4ffa13 100644 --- a/fast-import.c +++ b/fast-import.c @@ -983,8 +983,10 @@ static void end_packfile(void) pack_id++; } - else + else { + close(old_p->pack_fd); unlink(old_p->pack_name); + } free(old_p); /* We can't carry a delta across packfiles. */ |