aboutsummaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-07 15:14:54 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-07 15:14:54 -0800
commitd2216a4b133f90a543a0e4c4a9f9809a043012d6 (patch)
tree97866fbd1cd793ff15ac8a2da91e265468fa8ec6 /merge.c
parent427c6d0caf0caee5ad2c4925910a6b8ebcf95408 (diff)
parent7dac3f83218b9f6c4c7d1c1cf093190f20d27108 (diff)
downloadgit-d2216a4b133f90a543a0e4c4a9f9809a043012d6.tar.gz
git-d2216a4b133f90a543a0e4c4a9f9809a043012d6.tar.xz
Merge branch 'sb/gpg-plug-fd-leak' into maint
We forgot to close the file descriptor reading from "gpg" output, killing "git log --show-signature" on a long history. * sb/gpg-plug-fd-leak: gpg: close stderr once finished with it in verify_signed_buffer()
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions