Shorthand for "$(git merge-base A B)"

2019-03-15 Thread John Passaro
I find myself fairly frequently doing something like "git log $(git merge-base A B)..C". As far as I can tell, there is no shorthand for the $() part of this, but it seems like something that could be pretty naturally added, or documented better if there is some esoteric combination of the existing

Re: Can git choose perl at runtime?

2018-12-28 Thread John Passaro
On Sun, Dec 23, 2018 at 9:20 PM brian m. carlson wrote: > > I think we should just ask Homebrew to ship a functional, complete Git. They are doing just that: https://github.com/Homebrew/homebrew-core/pull/35446 If for some reason this patch doesn't make it in, I'll keep bugging them about it, but

Re: [PATCH 1/1] Add author and committer configuration settings

2018-12-19 Thread John Passaro
On Wed, Dec 19, 2018 at 2:19 PM William Hubbs wrote: > > The author.email, author.name, committer.email and committer.name > settings are analogous to the GIT_AUTHOR_* and GIT_COMMITTER_* > environment variables, but for the git config system. This allows them > to be set separatel

Re: [PATCH 0/4] Expose gpgsig in pretty-print

2018-12-18 Thread John Passaro
On Fri, Dec 14, 2018 at 6:10 PM John Passaro wrote: > All seems to work fine when I treat %Gs as a detached signature. In light of this, my best guess as to why the cleartext PGP message didn't verify properly is that the commit data normally doesn't end with \n, but as far as I can

Can git choose perl at runtime?

2018-12-18 Thread John Passaro
I recently submitted my first patch using OSX and found the experience frustrating, for reasons that have come up on the list before, concerning git-send-email and perl dependencies that you need to be root to update. Last seen here: https://public-inbox.org/git/878t55qga6@evledraar.gmail.com/

Re: [PATCH 0/4] Expose gpgsig in pretty-print

2018-12-14 Thread John Passaro
On Fri, Dec 14, 2018 at 6:10 PM John Passaro wrote: > > On Fri, Dec 14, 2018 at 11:49 AM Michał Górny wrote: > > > > On Fri, 2018-12-14 at 11:07 -0500, John Passaro wrote: > > > On Thu, Dec 13, 2018 at 11:12 PM Michał Górny wrote: > > > > > > > &

Re: [PATCH 0/4] Expose gpgsig in pretty-print

2018-12-14 Thread John Passaro
On Fri, Dec 14, 2018 at 11:49 AM Michał Górny wrote: > > On Fri, 2018-12-14 at 11:07 -0500, John Passaro wrote: > > On Thu, Dec 13, 2018 at 11:12 PM Michał Górny wrote: > > > > > > On Thu, 2018-12-13 at 16:22 -0500, John Passaro wrote: > > > > Currently

Re: Bug in lineendings handling that prevents resetting checking out, rebasing etc

2018-12-14 Thread John Passaro
On Fri, Dec 14, 2018 at 4:08 PM Mr&Mrs D wrote: > > Hi all, > > I maintain a python project you can clone from: > > g...@github.com:wrye-bash/wrye-bash.git > > For reasons unknown git sees a particular file as changed > (Mopy/Docs/Bash Readme Template.html, sometimes others too). This file > was p

Re: Bug: `git commit --fixup` with duplicate commit messages

2018-12-14 Thread John Passaro
On Fri, 14 Dec 2018, Oliver Joseph Ash wrote: > I believe I have found a bug in `git commit --fixup`. > > Steps to reproduce: > 1. Create a git history with two commits (A and B) with the same > commit message (e.g. foo) > 2. Create a new commit using `git commit --fixup {SHA}`, referring to > th

Re: [PATCH 0/4] Expose gpgsig in pretty-print

2018-12-14 Thread John Passaro
On Thu, Dec 13, 2018 at 11:12 PM Michał Górny wrote: > > On Thu, 2018-12-13 at 16:22 -0500, John Passaro wrote: > > Currently, users who do not have GPG installed have no way to discern > > signed from unsigned commits without examining raw commit data. I > > prop

[PATCH 4/4] docs/pretty-formats: add explanation + copy edits

2018-12-13 Thread John Passaro
Clarify description of %G? = "U" to say it can mean good signature but untrusted key. Make wording consistent between %G* placeholders and other placeholders by removing the verb "show". Signed-off-by: John Passaro --- Documentation/pretty-formats.txt | 13 +++-

[PATCH 3/4] doc, tests: pretty behavior when gpg missing

2018-12-13 Thread John Passaro
en, git complains to stderr that GPG cannot be found. That commit included low-level tests for this behavior. Now, test it also at the level of everyday user commands. Signed-off-by: John Passaro --- Documentation/pretty-formats.txt | 6 +- t/t7510-signed-commit.sh | 95 +++

[PATCH 1/4] pretty: expose raw commit signature

2018-12-13 Thread John Passaro
Add new pretty-format placeholders %GR and %G+ to support inspecting gpgsig commit header in pretty format, even if GPG is not available. Signed-off-by: John Passaro --- Documentation/pretty-formats.txt | 2 ++ pretty.c | 36 ++-- 2 files

[PATCH 0/4] Expose gpgsig in pretty-print

2018-12-13 Thread John Passaro
ersion of this branch based on that branch as well, so you can use that in case conflicts with aw/pretty-trailers arise. See: - https://github.com/jpassaro/git/tree/jp/pretty-expose-gpgsig - https://github.com/jpassaro/git/tree/jp/pretty-expose-gpgsig--based-on-aw-pretty-trailers John Passa

[PATCH 2/4] t/t7510-signed-commit.sh: test new placeholders

2018-12-13 Thread John Passaro
Test that %GR output ("Raw" contents of "gpgsig" header) looks like ASCII-armored GPG signature. Test %G+ (Y/N for presence/absence of "gpgsig" header) by adding it to existing format tests for signed commits. Signed-off-by: John Passaro ---

Re: [PATCH] run-command: report exec failure

2018-12-12 Thread John Passaro
edural question: I'd like to reference this patch in one of my own. Can I reference it as I typed it above? Or is there a chance of the SHA1 changing before it goes into some sort of a main history? John Passaro (917) 678-8293 On Tue, Dec 11, 2018 at 7:50 AM Junio C Hamano wrote: > > Joh

silent_exec_failure when calling gpg

2018-12-10 Thread John Passaro
I'd be very grateful if somebody on this list could tell me whether I can count on this behavior in the future, or whether my code should account for a possibility that this behavior could change in the future. I'd also be very very interested to see in what commit(s) this change occurred. Thanks in advance! John Passaro (917) 678-8293