fast-export: add --reference-excluded-parents option

git filter-branch has a nifty feature allowing you to rewrite, e.g. just
the last 8 commits of a linear history
git filter-branch $OPTIONS HEAD~8..HEAD

If you try the same with git fast-export, you instead get a history of
only 8 commits, with HEAD~7 being rewritten into a root commit.  There
are two alternatives:

1) Don't use the negative revision specification, and when you're
filtering the output to make modifications to the last 8 commits,
just be careful to not modify any earlier commits somehow.

2) First run 'git fast-export --export-marks=somefile HEAD~8', then
run 'git fast-export --import-marks=somefile HEAD~8..HEAD'.

Both are more error prone than I'd like (the first for obvious reasons;
with the second option I have sometimes accidentally included too many
revisions in the first command and then found that the corresponding
extra revisions were not exported by the second command and thus were
not modified as I expected).  Also, both are poor from a performance
perspective.

Add a new --reference-excluded-parents option which will cause
fast-export to refer to commits outside the specified rev-list-args
range by their sha1sum.  Such a stream will only be useful in a
repository which already contains the necessary commits (much like the
restriction imposed when using --no-data).

Note from Peff:
I think we might be able to do a little more optimization here. If
we're exporting HEAD^..HEAD and there's an object in HEAD^ which is
unchanged in HEAD, I think we'd still print it (because it would not
be marked SHOWN), but we could omit it (by walking the tree of the
boundary commits and marking them shown).  I don't think it's a
blocker for what you're doing here, but just a possible future
optimization.

Signed-off-by: Elijah Newren <newren@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index fda55b32846c16c40ce9e849609d5b55045b6615..f65026662af8b332b6f3e9383c68c0c987992a05 100644 (file)
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt
@@ -110,6 +110,18 @@ marks the same across runs.
        the shape of the history and stored tree.  See the section on
        `ANONYMIZING` below.
 
        the shape of the history and stored tree.  See the section on
        `ANONYMIZING` below.
 

+--reference-excluded-parents::
+       By default, running a command such as `git fast-export
+       master~5..master` will not include the commit master{tilde}5
+       and will make master{tilde}4 no longer have master{tilde}5 as
+       a parent (though both the old master{tilde}4 and new
+       master{tilde}4 will have all the same files).  Use
+       --reference-excluded-parents to instead have the the stream
+       refer to commits in the excluded range of history by their
+       sha1sum.  Note that the resulting stream can only be used by a
+       repository which already contains the necessary parent
+       commits.
+

 --refspec::
        Apply the specified refspec to each ref exported. Multiple of them can
        be specified.
 --refspec::
        Apply the specified refspec to each ref exported. Multiple of them can
        be specified.


@@ -119,8 +131,9 @@ marks the same across runs.
        'git rev-list', that specifies the specific objects and references
        to export.  For example, `master~10..master` causes the
        current master reference to be exported along with all objects
        'git rev-list', that specifies the specific objects and references
        to export.  For example, `master~10..master` causes the
        current master reference to be exported along with all objects

-       added since its 10th ancestor commit and all files common to
-       master{tilde}9 and master{tilde}10.
+       added since its 10th ancestor commit and (unless the
+       --reference-excluded-parents option is specified) all files
+       common to master{tilde}9 and master{tilde}10.

 
 EXAMPLES
 --------
 
 EXAMPLES
 --------

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d71e0333d4839336fbe3fa5b2d5e4fc9dd726ddf..78fc67b03aad7ede3e796d61a52fc4a194270c76 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -37,6 +37,7 @@ static int fake_missing_tagger;
 static int use_done_feature;
 static int no_data;
 static int full_tree;
 static int use_done_feature;
 static int no_data;
 static int full_tree;

+static int reference_excluded_commits;

 static struct string_list extra_refs = STRING_LIST_INIT_NODUP;
 static struct string_list tag_refs = STRING_LIST_INIT_NODUP;
 static struct refspec refspecs = REFSPEC_INIT_FETCH;
 static struct string_list extra_refs = STRING_LIST_INIT_NODUP;
 static struct string_list tag_refs = STRING_LIST_INIT_NODUP;
 static struct refspec refspecs = REFSPEC_INIT_FETCH;


@@ -597,7 +598,8 @@ static void handle_commit(struct commit *commit, struct rev_info *rev,
                message += 2;
 
        if (commit->parents &&
                message += 2;
 
        if (commit->parents &&

-           get_object_mark(&commit->parents->item->object) != 0 &&
+           (get_object_mark(&commit->parents->item->object) != 0 ||
+            reference_excluded_commits) &&

            !full_tree) {
                parse_commit_or_die(commit->parents->item);
                diff_tree_oid(get_commit_tree_oid(commit->parents->item),
            !full_tree) {
                parse_commit_or_die(commit->parents->item);
                diff_tree_oid(get_commit_tree_oid(commit->parents->item),


@@ -645,13 +647,21 @@ static void handle_commit(struct commit *commit, struct rev_info *rev,
        unuse_commit_buffer(commit, commit_buffer);
 
        for (i = 0, p = commit->parents; p; p = p->next) {
        unuse_commit_buffer(commit, commit_buffer);
 
        for (i = 0, p = commit->parents; p; p = p->next) {

-               int mark = get_object_mark(&p->item->object);
-               if (!mark)
+               struct object *obj = &p->item->object;
+               int mark = get_object_mark(obj);
+
+               if (!mark && !reference_excluded_commits)

                        continue;
                if (i == 0)
                        continue;
                if (i == 0)

-                       printf("from :%d\n", mark);
+                       printf("from ");
+               else
+                       printf("merge ");
+               if (mark)
+                       printf(":%d\n", mark);

                else
                else

-                       printf("merge :%d\n", mark);
+                       printf("%s\n", oid_to_hex(anonymize ?
+                                                 anonymize_oid(&obj->oid) :
+                                                 &obj->oid));

                i++;
        }
 
                i++;
        }
 


@@ -932,13 +942,22 @@ static void handle_tags_and_duplicates(struct string_list *extras)
                                /*
                                 * Getting here means we have a commit which
                                 * was excluded by a negative refspec (e.g.
                                /*
                                 * Getting here means we have a commit which
                                 * was excluded by a negative refspec (e.g.

-                                * fast-export ^master master).  If the user
+                                * fast-export ^master master).  If we are
+                                * referencing excluded commits, set the ref
+                                * to the exact commit.  Otherwise, the user

                                 * wants the branch exported but every commit
                                 * wants the branch exported but every commit

-                                * in its history to be deleted, that sounds
-                                * like a ref deletion to me.
+                                * in its history to be deleted, which basically
+                                * just means deletion of the ref.

                                 */
                                 */

-                               printf("reset %s\nfrom %s\n\n",
-                                      name, oid_to_hex(&null_oid));
+                               if (!reference_excluded_commits) {
+                                       /* delete the ref */
+                                       printf("reset %s\nfrom %s\n\n",
+                                              name, oid_to_hex(&null_oid));
+                                       continue;
+                               }
+                               /* set ref to commit using oid, not mark */
+                               printf("reset %s\nfrom %s\n\n", name,
+                                      oid_to_hex(&commit->object.oid));

                                continue;
                        }
 
                                continue;
                        }
 


@@ -1075,6 +1094,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
                OPT_STRING_LIST(0, "refspec", &refspecs_list, N_("refspec"),
                             N_("Apply refspec to exported refs")),
                OPT_BOOL(0, "anonymize", &anonymize, N_("anonymize output")),
                OPT_STRING_LIST(0, "refspec", &refspecs_list, N_("refspec"),
                             N_("Apply refspec to exported refs")),
                OPT_BOOL(0, "anonymize", &anonymize, N_("anonymize output")),

+               OPT_BOOL(0, "reference-excluded-parents",
+                        &reference_excluded_commits, N_("Reference parents which are not in fast-export stream by object id")),
+

                OPT_END()
        };
 
                OPT_END()
        };
 

diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 50c2fceef403c6d047632cea4b31486984ad470d..d7d73061d0d95ef667753ca6f7be9a82c56ac779 100755 (executable)
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -66,6 +66,17 @@ test_expect_success 'fast-export master~2..master' '
 
 '
 
 
 '
 

+test_expect_success 'fast-export --reference-excluded-parents master~2..master' '
+
+       git fast-export --reference-excluded-parents master~2..master >actual &&
+       grep commit.refs/heads/master actual >commit-count &&
+       test_line_count = 2 commit-count &&
+       sed "s/master/rewrite/" actual |
+               (cd new &&
+                git fast-import &&
+                test $MASTER = $(git rev-parse --verify refs/heads/rewrite))
+'
+

 test_expect_success 'iso-8859-1' '
 
        git config i18n.commitencoding ISO8859-1 &&
 test_expect_success 'iso-8859-1' '
 
        git config i18n.commitencoding ISO8859-1 &&