diff options
| author |  Stephen R Guglielmo <srguglielmo@gmail.com> | 2018-02-23 15:41:25 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-23 14:36:59 -0800 |
| commit | 8841b5222c63f4105d8751139a2b26dc2e3c5f9d (patch) | |
| tree | b965464b236bbc78e7278d2580e3391e75279f52 /patch-ids.h | |
| parent | Git 2.16.2 (diff) | |
| download | tgif-8841b5222c63f4105d8751139a2b26dc2e3c5f9d.tar.xz | |
subtree: fix add and pull for GPG-signed commits
If log.showsignature is true (or --show-signature is passed) while
performing a `subtree add` or `subtree pull`, the command fails.
toptree_for_commit() calls `log` and passes the output to `commit-tree`.
If this output shows the GPG signature data, `commit-tree` throws a
fatal error.
This commit fixes the issue by adding --no-show-signature to `log` calls
in a few places, as well as using the more appropriate `rev-parse`
instead where possible.
Signed-off-by: Stephen R Guglielmo <srg@guglielmo.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'patch-ids.h')
0 files changed, 0 insertions, 0 deletions