[PATCH v7 p2 0/2] fast-export fixes
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Nov 28, 2012, 22:23 UTC
- Message-ID
- <1354141440-26534-1-git-send-email-felipe.contreras@gmail.com>
Hi,
Here's version 7 part 2; I've dropped all the unnecessary patches, nobody seems to care about the current brokedness, and I did them only to show that these are correct, and that remote helpers without marks just don't work. These are the ones I care about.
Below is a summary of what happens when you apply both patches, and how the new behavior is obviously correct. All the refs point to the same object.
== before ==
% git fast-export --export--marks=marks master
# exported stuff
% git fast-export --{import,export}-marks=marks test
# nothing
% git fast-export --{import,export}-marks=marks master ^uninteresting
reset refs/heads/uninteresting
from :6 % git fast-export --{import,export}-marks=marks ^uninteresting master ^foo test
reset refs/heads/test
from :6reset refs/heads/foo from :6
reset refs/heads/master from :6
% git fast-export --{import,export}-marks=marks uninteresting..master== after ==
% git fast-export --export--marks=marks master
# exported stuff
% git fast-export --{import,export}-marks=marks test
reset refs/heads/test
from :6 % git fast-export --{import,export}-marks=marks master ^uninteresting
reset refs/heads/master
from :6 % git fast-export --{import,export}-marks=marks ^uninteresting master ^foo test
reset refs/heads/test
from :6reset refs/heads/master from :6
% git fast-export --{import,export}-marks=marks uninteresting..master
reset refs/heads/master
from :6Changes since v6:
* Drop all the extra patches * Reorder patches so tests never fail
Felipe Contreras (2): fast-export: don't handle uninteresting refs fast-export: make sure updated refs get updated
builtin/fast-export.c | 21 ++++++++++++++------- t/t5801-remote-helpers.sh | 28 ++++++++++++++++------------ t/t9350-fast-export.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 19 deletions(-)
-- 1.8.0.1