git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
To: git@vger.kernel.org
Subject: BUG: git subtree split gets confused on removed and readded directory
Date: Fri, 15 Jan 2016 17:23:24 +0100	[thread overview]
Message-ID: <56991CFC.7060705@ruhr-uni-bochum.de> (raw)

Hi,

I made a simple test repository showing the problem here:
https://github.com/lambdafu/git-subtree-split-test

After creating the master branch, I created the split/bar branch like this:

$ git subtree split -P bar -b split/bar

The resulting history is confused by the directory "bar" which was
added, removed and then re-added again.  The recent history up to adding
the directory the second time is fine.  But then it seems to loose track
and add the parent of that commit up to the initial commit in the history.

I'd expect that the parent of the readding commit is an empty tree
commit (which removed the last files in the directory), and that before
that are commits that reflect the initial creation of that directory
with its files, but rewritten as a subtree, of course.

Thanks!
Marcus

             reply	other threads:[~2016-01-15 16:29 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-15 16:23 Marcus Brinkmann [this message]
2016-01-15 23:44 ` BUG: git subtree split gets confused on removed and readded directory Junio C Hamano
2016-01-17 19:34   ` David Ware
2016-01-17 23:23   ` David A. Greene
2016-01-20  1:17     ` [PATCH] contrib/subtree: Split history with empty trees correctly (was: Re: BUG: git subtree split gets confused on removed and readded directory) Marcus Brinkmann
2016-01-20  4:05       ` [PATCH] contrib/subtree: Split history with empty trees correctly David A. Greene
2016-01-20 11:22         ` Marcus Brinkmann
2016-01-28  2:55           ` David A. Greene
2016-01-24 13:07         ` Marcus Brinkmann
2016-01-28  2:56           ` David A. Greene
2016-01-28  4:06             ` Marcus Brinkmann
2016-02-03  2:34               ` David A. Greene

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=56991CFC.7060705@ruhr-uni-bochum.de \
    --to=marcus.brinkmann@ruhr-uni-bochum.de \
    --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).