[PATCH v2] subtree: fix add and pull for GPG-signed commits

2018-02-23 Thread Stephen R Guglielmo
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

Re: [PATCH v2] subtree: fix add and pull for GPG-signed commits

2018-02-23 Thread Junio C Hamano
Stephen R Guglielmo writes: > 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-t

Re: [PATCH v2] subtree: fix add and pull for GPG-signed commits

2018-02-26 Thread Stephen R Guglielmo
On Fri, Feb 23, 2018 at 5:45 PM, Junio C Hamano wrote: > Stephen R Guglielmo writes: > >> 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-

Re: [PATCH v2] subtree: fix add and pull for GPG-signed commits

2018-02-26 Thread Junio C Hamano
Stephen R Guglielmo writes: > On Fri, Feb 23, 2018 at 5:45 PM, Junio C Hamano wrote: >... >> I am however starting to feel that >> ... >> may be a better approach. > ... > I'm happy to develop a new patch based on your recommendations. Should > it be on top of the previous patch I sent or should