From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Johannes Sixt <j6t@kdbg.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Max Horn <max@quendi.de>, Sverre Rabbelier <srabbelier@gmail.com>,
Brandon Casey <drafnel@gmail.com>,
Brandon Casey <casey@nrlssc.navy.mil>,
Jonathan Nieder <jrnieder@gmail.com>,
Ilari Liusvaara <ilari.liusvaara@elisanet.fi>,
Pete Wyckoff <pw@padd.com>, Ben Walton <bdwalton@gmail.com>,
Matthieu Moy <Matthieu.Moy@imag.fr>,
Julian Phillips <julian@quantumfyre.co.uk>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v6 p1.1 01/14] fast-export: avoid importing blob marks
Date: Sat, 24 Nov 2012 04:17:01 +0100 [thread overview]
Message-ID: <1353727034-24698-2-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1353727034-24698-1-git-send-email-felipe.contreras@gmail.com>
We want to be able to import, and then export, using the same marks, so
that we don't push things that the other side already received.
Unfortunately, fast-export doesn't store blobs in the marks, but
fast-import does. This creates a mismatch when fast export is reusing a
mark that was previously stored by fast-import.
There is no point in one tool saving blobs, and the other not, but for
now let's just check in fast-export that the objects are indeed commits.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/fast-export.c | 4 ++++
t/t9350-fast-export.sh | 14 ++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 12220ad..9b70ec1 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -614,6 +614,10 @@ static void import_marks(char *input_file)
if (object->flags & SHOWN)
error("Object %s already has a mark", sha1_to_hex(sha1));
+ if (object->type != OBJ_COMMIT)
+ /* only commits */
+ continue;
+
mark_object(object, mark);
if (last_idnum < mark)
last_idnum = mark;
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 3e821f9..5948b65 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -440,4 +440,18 @@ test_expect_success 'fast-export quotes pathnames' '
)
'
+test_expect_success 'test bidirectionality' '
+ >marks-cur &&
+ >marks-new &&
+ git init marks-test &&
+ git fast-export --export-marks=marks-cur --import-marks=marks-cur --branches | \
+ git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks=marks-new &&
+ (cd marks-test &&
+ git reset --hard &&
+ echo Wohlauf > file &&
+ git commit -a -m "back in time") &&
+ git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks=marks-new --branches | \
+ git fast-import --export-marks=marks-cur --import-marks=marks-cur
+'
+
test_done
--
1.8.0
next prev parent reply other threads:[~2012-11-24 3:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-24 3:17 [PATCH v6 p1.1 00/14] fast-export and remote-testgit improvements Felipe Contreras
2012-11-24 3:17 ` Felipe Contreras [this message]
2012-11-24 3:17 ` [PATCH v6 p1.1 02/14] remote-testgit: fix direction of marks Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 03/14] remote-helpers: fix failure message Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 04/14] Rename git-remote-testgit to git-remote-testpy Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 05/14] Add new simplified git-remote-testgit Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 06/14] remote-testgit: remove non-local functionality Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 07/14] remote-testgit: remove irrelevant test Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 08/14] remote-testgit: cleanup tests Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 09/14] remote-testgit: exercise more features Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 10/14] remote-testgit: report success after an import Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 11/14] remote-testgit: implement the "done" feature manually Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 12/14] fast-export: trivial cleanup Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 13/14] fast-export: fix comparison in tests Felipe Contreras
2012-11-24 3:17 ` [PATCH v6 p1.1 14/14] fast-export: make sure updated refs get updated Felipe Contreras
2012-11-26 23:04 ` [PATCH v6 p1.1 00/14] fast-export and remote-testgit improvements Junio C Hamano
2012-11-26 23:23 ` Felipe Contreras
2012-11-26 23:52 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353727034-24698-2-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=Matthieu.Moy@imag.fr \
--cc=bdwalton@gmail.com \
--cc=casey@nrlssc.navy.mil \
--cc=drafnel@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ilari.liusvaara@elisanet.fi \
--cc=j6t@kdbg.org \
--cc=johannes.schindelin@gmx.de \
--cc=jrnieder@gmail.com \
--cc=julian@quantumfyre.co.uk \
--cc=max@quendi.de \
--cc=peff@peff.net \
--cc=pw@padd.com \
--cc=srabbelier@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).