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 14/14] fast-export: make sure updated refs get updated
Date: Sat, 24 Nov 2012 04:17:14 +0100 [thread overview]
Message-ID: <1353727034-24698-15-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1353727034-24698-1-git-send-email-felipe.contreras@gmail.com>
When an object has already been exported (and thus is in the marks) it's
flagged as SHOWN, so it will not be exported again, even if in a later
time it's exported through a different ref.
We don't need the object to be exported again, but we want the ref
updated, which doesn't happen.
Since we can't know if a ref was exported or not, let's just assume that
if the commit was marked (flags & SHOWN), the user still wants the ref
updated.
IOW: If it's specified in the command line, it will get updated,
regardless of whether or not the object was marked.
So:
% git branch test master
% git fast-export $mark_flags master
% git fast-export $mark_flags test
Would export 'test' properly.
Additionally, this fixes issues with remote helpers; now they can push
refs whose objects have already been exported, and a few other issues as
well. Update the tests accordingly.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/fast-export.c | 10 +++++++---
t/t5801-remote-helpers.sh | 20 ++++++++------------
t/t9350-fast-export.sh | 15 +++++++++++++++
3 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 191936c..31bfbee 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -523,10 +523,14 @@ static void get_tags_and_duplicates(struct object_array *pending,
typename(e->item->type));
continue;
}
- if (commit->util)
- /* more than one name for the same object */
+
+ /*
+ * This ref will not be updated through a commit, lets make
+ * sure it gets properly updated eventually.
+ */
+ if (commit->util || commit->object.flags & SHOWN)
string_list_append(extra_refs, full_name)->util = commit;
- else
+ if (!commit->util)
commit->util = full_name;
}
}
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 12ae256..b2782a2 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -63,18 +63,6 @@ test_expect_success 'fetch new branch' '
compare_refs server HEAD local FETCH_HEAD
'
-#
-# This is only needed because of a bug not detected by this script. It will be
-# fixed shortly, but for now lets not cause regressions.
-#
-test_expect_success 'bump commit in server' '
- (cd server &&
- git checkout master &&
- echo content >>file &&
- git commit -a -m four) &&
- compare_refs server HEAD server HEAD
-'
-
test_expect_success 'fetch multiple branches' '
(cd local &&
git fetch
@@ -162,4 +150,12 @@ test_expect_failure 'pushing without marks' '
compare_refs local2 HEAD server HEAD
'
+test_expect_success 'push ref with existing object' '
+ (cd local &&
+ git branch dup master &&
+ git push origin dup
+ ) &&
+ compare_refs local dup server dup
+'
+
test_done
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 1f59862..237d2e5 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -454,4 +454,19 @@ test_expect_success 'test bidirectionality' '
git fast-import --export-marks=marks-cur --import-marks=marks-cur
'
+cat > expected << EOF
+reset refs/heads/master
+from :12
+
+EOF
+
+test_expect_success 'refs are updated even if no commits need to be exported' '
+ > tmp-marks &&
+ git fast-export --import-marks=tmp-marks \
+ --export-marks=tmp-marks master > /dev/null &&
+ git fast-export --import-marks=tmp-marks \
+ --export-marks=tmp-marks master > actual &&
+ test_cmp expected actual
+'
+
test_done
--
1.8.0
next prev parent reply other threads:[~2012-11-24 3:18 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 ` [PATCH v6 p1.1 01/14] fast-export: avoid importing blob marks Felipe Contreras
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 ` Felipe Contreras [this message]
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-15-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).