How can I tell if one commit is an ancestor of another commit (or vice-versa)?

by

Use git merge-base --is-ancestor <commit1> <commit2>

There is more than one way to find the answer to this. The simplest is to use

git merge-base --is-ancestor <possible-ancestor-commit> <commit>

From the documentation for git merge-base:

--is-ancestor

Check if the first <commit> is an ancestor of the second <commit>, and exit with status 0 if true, or with status 1 if not. Errors are signaled by a non-zero status that is not 1.

Other options

git log with triple dot ... notation

Another option is to use git log and use triple dot notation ... to tell Git to output the set union of the child commits, minus the set intersection. Basically, it tells you how a set of commits have diverged from each other:

$ git log --oneline --graph --left-right \
--first-parent --decorate <commit1>...<commit2>

The above command will show you commits that are reachable from commit1 or commit2, but not both, i.e. C1 UNION C2 – C1 INTERSECTION C2, in terms of set operations.

If neither commit is a parent of the other, you’ll see the child commits of both, but if one is an ancestor of the other, you’ll only see the output for the descendant commit, since the ancestor is contained in the path of the descendant, and is thus excluded from the output.

You can read more about git log and triple dot notation from the following resources:

  1. git-log(1).
  2. gitrevisions(1): Specifying Ranges.
  3. Revision Selection.

git branch –contains option

git-rev-list(1) seems like it could be used to answer this. Another way is to simply attach temporary branch labels to the commits you want to test, and then use the --contains option for git branch:

git branch --contains <commit-to-test>

The output will be all branches that contain the commit somewhere in their commit tree, so by using a temporary branch on the other commit, you can see if the commit you’re testing is an ancestor.

From the documentation:

--contains [<commit>]

Only list branches which contain the specified commit (HEAD if not specified).

More Related Contents:

  1. How can I view an old version of a file with Git?
  2. How to fetch all Git branches
  3. Where do the settings in my Git configuration come from?
  4. git status shows modifications, git checkout — doesn’t remove them
  5. How to configure Git for using it with Dropbox?
  6. Git Init in home directory – now unable to commit changes
  7. Does github remember commit IDs?
  8. git add * (asterisk) vs git add . (period)
  9. Git merge reports “Already up-to-date” though there is a difference
  10. How do I diff the same file between two different commits on the same branch?
  11. How can I get Git to follow symlinks?
  12. Prevent commits in master branch
  13. Install npm module from gitlab private repository
  14. git: Apply changes introduced by commit in one repo to another repo
  15. git hooks : is there a clone hook?
  16. Having Trouble Switching Github accounts on terminal
  17. How to compare two different commits on the same branch in github?
  18. Differences between “git pull” commands when pulling from origin?
  19. git refname ‘origin/master’ is ambiguous
  20. Switch Git branch without files checkout
  21. git commit signing failed: secret key not available
  22. How to git reset –hard a subdirectory
  23. Git: How to find out on which branch a tag is?
  24. Git submodules workflow
  25. What are the git concepts of HEAD, master, origin?
  26. Where does Git store the SHA1 of the commit for a submodule?
  27. Git rebase branch with all parent branches (or dependent sub-branches)
  28. How to find the N largest files in a git repository?
  29. What’s the difference between git stash save and git stash push?
  30. Telling if a Git commit is a Merge/Revert commit

Leave a Comment