From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: [BUG] git-log shows first parent and repeated last for octopus merge
Date: Wed, 18 Oct 2006 13:11:35 +0200 [thread overview]
Message-ID: <eh5242$rar$1@sea.gmane.org> (raw)
When trying to find how many merges and how many octopus merges (merges with
more than two parents) are in git.git repository I have encountered the
following strange output of git-log:
1000:jnareb@roke:~/git> git log --parents --full-history --max-count=1 \
211232bae64bcc60bbf5d1b5e5b2344c22ed767e -- a//b
commit 211232bae64bcc60bbf5d1b5e5b2344c22ed767e <last parent repeated>
Merge: d0d0d0b... d0d0d0b... d0d0d0b... d0d0d0b... d0d0d0b...
[...]
while git-show gives correct output
1005:jnareb@roke:~/git> git show 211232bae64bcc60bbf5d1b5e5b2344c22ed767e
commit 211232bae64bcc60bbf5d1b5e5b2344c22ed767e
Merge: fc54a9c... 9e30dd7... c4b83e6... 6602659... b28858b...
[...]
Same with git-rev-list, also shows correct output:
1005:jnareb@roke:~/git> git rev-list --header --parents --max-count=1 \
211232bae64bcc60bbf5d1b5e5b2344c22ed767e
211232bae64bcc60bbf5d1b5e5b2344c22ed767e [...]
tree cdafa88fa4ed7fcc7bb6c64d62e2d7c4d3b65e42
parent fc54a9c30ccad3fde5890d2c0ca2e2acc0848fbc
parent 9e30dd7c0ecc9f10372f31539d0122db97418353
parent c4b83e618f1df7d8ecc9392fa40e5bebccbe6b5a
parent 660265909fc178581ef327076716dfd3550e6e7b
parent b28858bf65d4fd6d8bb070865518ec43817fe7f3
[...]
1008:jnareb@roke:~/git> git --version
git version 1.4.2.1
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next reply other threads:[~2006-10-18 11:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-18 11:11 Jakub Narebski [this message]
2006-10-18 13:53 ` [BUG] git-log shows first parent and repeated last for octopus merge Johannes Schindelin
2006-10-18 14:02 ` Jakub Narebski
2006-10-18 14:26 ` [PATCH] When rewriting parents, cull duplicates Johannes Schindelin
2006-10-18 19:02 ` [BUG] git-log shows first parent and repeated last for octopus merge Junio C Hamano
2006-10-18 16:35 ` A Large Angry SCM
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='eh5242$rar$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.