git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: rev-list --reverse --full-history --parents with path limiter disconnects history
Date: Thu, 21 Aug 2008 18:27:50 +0200	[thread overview]
Message-ID: <48AD9786.80707@viscovery.net> (raw)

[-- Attachment #1: Type: text/plain, Size: 1164 bytes --]

Attached is a repository (to be imported via git fast-import) that has
such a history:

o--o--A--B--o
 \           \
  o--o--C-----M--o--X   <- master

where the A,B,C touch path P2 such that P2 is the same after B and C.
Commit X touches P2 as well.

This command does not give the expected result: It reports *two* initial
commits and one merge; in particular, commit X is reported as initial commit.

$ git rev-list --parents --reverse --full-history master -- P2

This command gives the expected result, i.e. there is one initial commit,
one merge, and some more regular commits:

$ git rev-list --parents --full-history master -- P2

And this works as well, i.e there is a linear history that omits the
branch via C:

$ git rev-list --parents --reverse master -- P2

Please help!

BTW, I've observed this behavior earlier when I debugged David Tweed's
repository, after which we removed --full-history from git-filter-branch.
But I could not easily find a simple history that exposes the problem. Now
I have such a history.

BTW2, using --simplify-merges instead of --full-history has the same
problem (but I don't think that comes as a surprise).

-- Hannes

[-- Attachment #2: example.git.gfi.bz2 --]
[-- Type: application/octet-stream, Size: 3593 bytes --]

             reply	other threads:[~2008-08-21 16:29 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-21 16:27 Johannes Sixt [this message]
2008-08-29 19:18 ` [PATCH] rev-list: fix --reverse interaction with --parents Thomas Rast
2008-08-29 19:53   ` Johannes Sixt
2008-08-31  5:51   ` Junio C Hamano

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=48AD9786.80707@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).