diff options
| author |  René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2013-04-10 19:00:20 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-10 12:26:14 -0700 |
| commit | 24676f02ba8bcf0f2c5cccd02825e15ca93bb5f4 (patch) | |
| tree | fc00414e8c7908c9f76d22341af335a087dbfc63 /Documentation/merge-strategies.txt | |
| parent | archive: handle commits with an empty tree (diff) | |
| download | tgif-24676f02ba8bcf0f2c5cccd02825e15ca93bb5f4.tar.xz | |
t5004: fix issue with empty archive test and bsdtar
bsdtar, which is the default tar on Mac OS X, handles empty archives
just fine but reports archives containing only a pax extended header
comment as damaged. Work around the issue by explicitly generating
the archive for the tree and not the commit, which causes git archive
to omit the commit hash comment record from the tar file.
Reported-by: BJ Hargrave <bj@bjhargrave.com>
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions