[git-users] Re: git log "double dot" showing a false positive?

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

[git-users] Adding a pull request (newer master) to my build

I'm looking for how to add a pull request, based off a newer master, to my master. The specifics: I'm trying to work with OBS 18.0.2 (version 19 won't run on my older OS). I'm trying to add in a pull request (979, https://github.com/jp9000/obs-studio/pull/979 ) to my build. That pull request

[git-users] Re: git log "double dot" showing a false positive?

Hi Chris, On Monday, August 7, 2017 at 5:28:15 PM UTC+2, Chris Murphy wrote: > > The history of the repo is quite tangled with many merges, but I uploaded > it here (with sensitive info removed, sorry, it's a repo for my work) in > case it helps: >

[git-users] Re: git log "double dot" showing a false positive?

I agree :) Our workflow is such that: - branch B should've been created from a point in time of branch A. I can't guarantee that that's what happened (as I understand it, it's hard to determine whether this is the case, as git doesn't care about this). - branch A should've been occasionally

[git-users] Re: git log "double dot" showing a false positive?

I think some of the things you found strange in that first gist are explainable by the command i ran --- maybe this will be better: git log --format=%h\ %d --graph branchB | grep -o ".*[0-9a-f]\{10\} " https://gist.github.com/cmurphycode/c1233902e529e7a8e5a5e0586dd29bac especially in

[git-users] Re: git log "double dot" showing a false positive?

Hi Chris, On Monday, August 7, 2017 at 9:48:26 PM UTC+2, Chris Murphy wrote: > > The gist I uploaded was created via > git log --format=%h\ %d --graph branchA branchB > Is this the _exact_ command you used, or you had some additional grepping in there as well (as with your other gists)? Only

Re: [git-users] Re: git describe's way of choosing the "most recent" tag

On Sun, Aug 06, 2017 at 09:14:15AM -0700, Michael wrote: > > # get most recent annotated tag (by time-of-tagging) > > $ git for-each-ref --sort='-*committerdate' refs/tags | head --lines=1 > > > > # get most recent lightweight tag (by time-of-commit) > > $ git for-each-ref

[git-users] git log "double dot" showing a false positive?

Hi, My understanding is that the command git log branchA..branchB should return the commits reachable via branchB that are not reachable via branchA I use this command a lot and have never noticed an issue, until

Re: [git-users] git log "double dot" showing a false positive?

On Mon, Aug 07, 2017 at 08:28:15AM -0700, Chris Murphy wrote: [...] > ą % git --version > git version 2.13.0 > > % git log branchA..branchB | grep 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc > commit 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc > > ą % git log branchA | grep

Re: [git-users] git log "double dot" showing a false positive?

Thanks Konstantin, You are right - I would expect that triple-dot shows this commit (but not double-dot). I included the triple-dot command to show what git thinks for the --left-right value, in case that was helpful. On Monday, August 7, 2017 at 11:54:11 AM UTC-4, Konstantin Khomoutov wrote:

Re: [git-users] git log "double dot" showing a false positive?

> > > >> > % git log branchA..branchB | grep >> 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc >> > commit 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc >> > >> > ą % git log branchA | grep 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc >> > commit 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc >> > >> > ą %

Re: [git-users] git log "double dot" showing a false positive?

Have you checked how many merge bases there are for the two branches? It is possible in complex criss-cross merge scenarios to have multiple merge bases. IIUC this may give different results for the double dot case depending on which of the merge-bases was used. I could well be wrong. But it is

Re: [git-users] git log "double dot" showing a false positive?

Unfortunately not -- that's also why I included the --contains result. ± % git log --pretty="%H" branchA | grep 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc ± % git log --pretty="%H" branchB | grep 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc