login
Header Space

 
 

Re: git filter-branch --subdirectory-filter

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Jeff King <peff@...>
Cc: <git@...>
Date: Friday, May 9, 2008 - 3:38 am

Hi Jeff,

After reading your reponse and re-reading my original email, I
realised it was totally unclear
so I have re-explained myself below.

2008/5/9 Jeff King <peff@peff.net>:

I must have experienced a brain fart or something or missed the '-r' from
git branch...


Yes that's true, but...

Clearer explanation:

I originally tried --subdirectory-filter by itself to see if it would
do the job, but it filtered
more commits than I thought it should (some commits that touched the subdir were
missing after filter-branch was run).

I then began to question my understanding of the semantics of
subdirectory-filter.

Is it meant to:
A) Only keep commits where ALL of the changes in the commit only touch
content under $DIR?
B) Only keep commits where SOME of the changes in the commit touch
content under $DIR?

I suspected that it was behaving as A.

That's when I decided to run the commit-filter first in combination
with the tree-filter.  This would
leave me with all commits that touched the subdir but any commit that
touched multiple subdirs
would be cleaned up so it only touched the subdir I want to keep.

At this point I have a bunch of commits that only make changes to
subdir (verified using gitk), and I would
expect subdirectory-filter to keep every single commit.

However, after running it, I loose most of my commits.  Strangely, the
working tree is bit-for-bit correct
with the original version or the subdir in the old repo, but the
history leading up to it is not.

--subdirectory-filter does not seem to behave as either A or B above
but something other way.  I'm sure
it will turn out to be something silly, but I'm pulling my hair out
trying to figure this one out.

Hopefully that's a clearer explanation!

-- 
James
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
git filter-branch --subdirectory-filter, James Sadler, (Thu May 8, 9:01 pm)
Re: git filter-branch --subdirectory-filter, Jeff King, (Thu May 8, 9:33 pm)
Re: git filter-branch --subdirectory-filter, James Sadler, (Fri May 9, 3:38 am)
Re: git filter-branch --subdirectory-filter, Jeff King, (Fri May 9, 4:00 am)
Re: git filter-branch --subdirectory-filter, James Sadler, (Fri May 9, 11:31 pm)
Re: git filter-branch --subdirectory-filter, Jeff King, (Sat May 10, 1:53 am)
Re: git filter-branch --subdirectory-filter, James Sadler, (Sat May 10, 7:38 am)
Re: git filter-branch --subdirectory-filter, Jeff King, (Sat May 10, 7:44 am)
Re: git filter-branch --subdirectory-filter, James Sadler, (Sat May 10, 3:10 am)
Re: git filter-branch --subdirectory-filter, Johannes Sixt, (Fri May 9, 3:57 am)
speck-geostationary