One more thing that may be of interest; this is not the only commit that is 
behaving badly.

git log branchA..branchB --oneline | while read id junk; do git log branchA 
| grep $id; done

Merge: 95aadbe485 dae6c2c57b
commit dae6c2c57b49c934c5c5af248a2f8a6cfcf3006d
commit e4b165feb93c0157fb738124961527ef6af5716d
Merge: e4b165feb9 610742e226
commit f8e568e192e6bde2711fc0ad2f5fdf56198faf02
Merge: f18e5a91ad b9cbe3dc68
commit f18e5a91ad48263633ca767188c1f8028ec707e2
Merge: f18e5a91ad b9cbe3dc68
commit b9cbe3dc68a9b0b987fa5be50d46b77115a68dde
commit 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc

On Tuesday, August 8, 2017 at 8:38:09 AM UTC-4, Chris Murphy wrote:
>
> You're right, I didn't mean to leave the --tags=1 in. I double checked 
> that the --tags and greps didn't remove any lines from the output.
>
> However, I did overlook the carat syntax - on zsh, those need to be 
> escaped. I repeated this with escapes and also double-checked against bash 
> just in case. I think this is what you wanted:
>
> https://gist.github.com/cmurphycode/5df15669ce1e5c33f3e69d997b465d6d
>
> https://gist.github.com/cmurphycode/114c869323d6d161fd77aa924e769bcd
>
> Here's what the branches point to as of right now, just to be sure :)
>
> ± % git show-ref branchA
> c7770ea9a062d189dc2e3238bdd6f5987d86e1cb refs/heads/branchA
>
> ± % git show-ref branchB
> 944405f8308c77200f7f4cb860a3f95a7a8ba6dd refs/heads/branchB
>
> Thanks for your patience, I appreciate the help!
>
>
>
> On Tuesday, August 8, 2017 at 2:45:07 AM UTC-4, Igor Djordjevic wrote:
>>
>> Hi Chris,
>>
>> On Tuesday, August 8, 2017 at 4:02:43 AM UTC+2, Chris Murphy wrote:
>>>
>>> Oh man, sorry, I totally screwed up when editing the output to exclude 
>>> tags, making the graph totally wrong since some lines were missing. Sorry 
>>> about that.
>>>
>>> I've fixed that issue (Sorry, I still have to edit out tags. I'm 
>>> using grep -o ".*[0-9a-f]\{10\}\|.* $", and open to any better suggestions)
>>>
>>>
>>> Here's command 1
>>> git log --tags=1 --format=%h\%d --graph --sparse --full-history branchA 
>>> branchB ^03dd551f031f48e8702f9154b23f53af8cc4799b^ | grep -o 
>>> ".*[0-9a-f]\{10\}\|.* $"
>>> https://gist.github.com/cmurphycode/84d7efae872a4f23dfb01efdad4836e7
>>>
>>> command 2
>>> git log --format=%h\%d --graph --sparse --full-history branchA branchB 
>>> ^9ba8f06829b2d2170f23254ed3fe8f3727fe56dc^ | grep -o ".*[0-9a-f]\{10\}\|.* 
>>> $"
>>> https://gist.github.com/cmurphycode/0498a5530e68382d32f1833dfd669311
>>>
>>
>> That looks much better, but I`m not sure if it can/should still be 
>> trusted, either, as "--tags=1" parameter you added can cause (pretty much?) 
>> all history to still be included, missing the point of last ^{commit}^ 
>> restriction, and might be grepping could still omit some lines...?
>>
>> If you would prefer not showing tags, maybe the easiest approach would be 
>> omitting "decorations" placeholder "%d" inside "--format" parameter 
>> altogether:
>>
>> (*1*) $ git log --format=%h --graph --sparse --full-history branchA 
>> branchB ^03dd551f031f48e8702f9154b23f53af8cc4799b^
>>
>> ... and:
>>
>> (*2*) $ git log --format=%h --graph --sparse --full-history branchA 
>> branchB ^9ba8f06829b2d2170f23254ed3fe8f3727fe56dc^
>>
>> This should produce desired graph history with only commit sha1`s shown, 
>> no need to grep anything out.
>>
>> We already know the commits branches A and B point to from your previous 
>> examples, so missing these should not be a problem -- unless your history 
>> changed further, in which case you could write these to the right of 
>> corresponding commits by hand (paying attention not to break the graph 
>> layout - in case you`re not sure, better just leave it as it is).
>>
>> Regards,
>> Buga
>>
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to