Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make dolt log work with ^ ancestor spec #4594

Merged
merged 2 commits into from
Oct 24, 2022
Merged

Conversation

tbantle22
Copy link
Contributor

No description provided.

Base automatically changed from taylor/log-tf-options-1 to main October 21, 2022 18:37
run dolt log main^..branch1
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was expecting AFTER would be in the results... main looks like it's currently pointing at the commit with the AFTER commit message, so main^ should move the exclusion commit to the parent of main, and cause main's current commit to be included in the log. I might just be misreading something though...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So if the commit graph looks like this:

A - B - F (main)
     \
       C - D - E (branch1)

dolt log main..branch is essentially dolt log F..E (all branch1, excluding commits from main - E, D, C)

And then dolt log main^..branch is dolt log B..E (all branch1, excluding commits reachable from B, which is still E, D, C because branch1 does not reach F)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahhh... yes! Thank you for drawing it out and double checking that. Figured I must just be missing something if everything else was working. Looks great!

Copy link
Contributor

@fulghum fulghum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! ✨

@tbantle22 tbantle22 merged commit 9f9d0cc into main Oct 24, 2022
@tbantle22 tbantle22 deleted the taylor/log-ancestor-spec branch October 24, 2022 23:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants