I know there has been very similar questions here, but they didn't solve my problem. Perhaps there's something I'm not understanding well.
This is a portion of the commit history of fitnesse (https://github.com/unclebob/fitnesse/):
* | | | | | | | | | | | | | | | fa86be8 Avoid possible issue when using CachingPage under heavy memory load.
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | 7b4a07a Merge pull request #256 from barredijkstra/fitnesse_issue_250
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | ecf5891 Fixed test checking for OS specific exception message.
| * | | | | | | | | | | | | | | 082236e Added rendering of cause exceptions. Fix for unclebob/fitnesse#250
* | | | | | | | | | | | | | | | a92b37f Merge pull request #243 from amolenaar/fix/243-hash-table-rendering
I want the list of commits between 2 commit hashes. In this particular case, I want the commits between ecf5891
and 7b4a07a
, and I expect the result to be:
ecf5891
7b4a07a
Si far I've been using git rev-list commit_hash_from_here^..commit_hash_up_to_here
and it has worked fine with linear history. However, in this case I get a lot more commits.
I've tried this and it works just as expected:
git log --since='<date ecf5891>' --until='<date 7b4a07a>'
(I've manually searched for those 2 dates).
One possible solution is to get the 2 dates and just do that, but I think there should be a better way.
Edit:
7b4a07a
parents are ecf5891
and a92b37f
. So far, the solutions work fine if I want to go from ecf5891
to 7b4a07a
, but if I want to go from a92b37f
to 7b4a07a
I want to get:
7b4a07a
ecf5891
082236e
a92b37f
but I don't get a92b37f
Add ^7b4a07a~ to also exclude everything reachable from the merge's first parent. You're only excluding what's reachable from its second parent.
"Between" is a somewhat slippery notion, when it comes to git commits.
The text you show above, with a snippet of graph output, shows why
from^..to
produces more than just those two commits: theto
part is a merge commit.The notation
A..B
is really just shorthand forB ^A
. That is, "everything starting fromB
and working backwards, minus everything starting fromA
and working backwards". ButB
is a merge commit, so "everything starting there and working backwards" uses both parents.Here the first parent of
7b4a07a
isa92b37f
(not in your [original] snippet above but I cloned the linked repo and found it). We can refer to it symbolically, though, and I will below. The second parent of7b4a07a
isecf5891
, the "from" part you're interested in.When you ask for:
that means:
which is the same as:
which gets you both parents of the merge, and then trims off everything from
082236e
back. You need to trim off everything from7b4a07a^
—the first parent—and back as well:In general, though, you have to figure out which descendent line(s) to chop-off.
Edit: you can stick with the
A..B
notation, but you do need to add the extra "exclude". So jthill's answer works too, once you move the hat to the front.Re your edit ("if I want to go from
a92b37f
to7b4a07a
"): we're back to that issue of "between" being a slippery notion. Which commits are "between"? There's a direct line froma92b37f
to7b4a07a
, becausea92b37f
is one of the two parents of the merge commit7b4a07a
. So by the earlier logic ("commits directly on an ancestral line", perhaps "inclusive") that would just be one, or maybe both, of those two commits. But you say you want two commits that are not, in any ancestral sense, related toa92b37f
at all. Why do you want those two particular commits? What makes082236e
"interesting" and082236e^
, its parent, "uninteresting"?First identify the relevant 2 commit hashes that you need for getting the list of commit hashes in between them by using
Then you can pick the relevant two commit hashes and find the commit hashes in between them by using
I think that you`re looking for --ancestry-path, in your case: