From: "Santi Béjar" <santi@agolina.net>
To: Git Mailing List <git@vger.kernel.org>,
Adam Simpkins <adam@adamsimpkins.net>
Subject: interaction between --graph and --simplify-by-decoration
Date: Fri, 31 Jul 2009 13:11:00 +0200 [thread overview]
Message-ID: <adf1fd3d0907310411j401b4e89r5f1dfc2b0d3b7ff4@mail.gmail.com> (raw)
Hello,
I've found that in some cases the --graph and
--simplify-by-decoration don't work well together. If you do this in
the git.git repository:
$ git log --graph --simplify-by-decoration --oneline v1.6.3.3
* cff4231 (tag: v1.6.3.3) GIT 1.6.3.3
* 6c7f58d (tag: v1.6.3.2) GIT 1.6.3.2
* 4774780 (tag: v1.6.3.1) GIT 1.6.3.1
* f01f109 (tag: v1.6.3) GIT 1.6.3
* 3536ae3 Sync with GIT 1.6.2.5
|\
| * a48f5d7 (tag: v1.6.2.5) GIT 1.6.2.5
| * 00f97c7 Merge branch 'maint-1.6.1' into maint
| |\
| | * bab39ed (tag: v1.6.1.4) GIT 1.6.1.4
* | | 503f464 (tag: v1.6.3-rc4) GIT 1.6.3-rc4
* | | 95110d7 (tag: v1.6.3-rc3) t4202: fix typo
* | | f29ac4f (tag: v1.6.3-rc2) GIT 1.6.3-rc2
/ /
| | * 66996ec Sync with 1.6.2.4
| | |\
| |_|/
|/| |
* | | 1f9b620 (tag: v1.6.2.4) GIT 1.6.2.4
| | * 77b96d6 (tag: v1.6.3-rc1) Update draft release notes to 1.6.3
| | * c965c02 (tag: v1.6.3-rc0) GIT 1.6.3-rc0
| |/
|/|
you can see that f29ac4f looks like it does not have any parents while
the correct parent is 66996ec which seems to have no children. But if
you omit the --oneline you can see that there are a lot of "root"-like
commits (f01f109, a48f5d7, f29ac4f,...).
gitk gets it right, and I've test also the first commit with both
flags and it happens the same.
Thanks,
Santi
next reply other threads:[~2009-07-31 11:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-31 11:11 Santi Béjar [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-08-18 20:55 interaction between --graph and --simplify-by-decoration Adam Simpkins
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=adf1fd3d0907310411j401b4e89r5f1dfc2b0d3b7ff4@mail.gmail.com \
--to=santi@agolina.net \
--cc=adam@adamsimpkins.net \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).