From: anatoly techtonik <techtonik@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: Round-tripping fast-export/import changes commit hashes
Date: Wed, 3 Mar 2021 00:52:53 +0300 [thread overview]
Message-ID: <CAPkN8xKM0zi-AB1xKRGp=whEQTZAbn78w0JjvUXfGfRDky0C=w@mail.gmail.com> (raw)
In-Reply-To: <xmqqblc2srq0.fsf@gitster.c.googlers.com>
On Mon, Mar 1, 2021 at 8:34 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> It is just that the output stream of fast-export is designed to be
> "filtered" and the expected use case is to modify the stream somehow
> before feeding it to fast-import. And because every object name and
> commit & tag signature depends on everything that they can reach,
> even a single bit change in an earlier part of the history will
> invalidate any and all signatures on objects that can reach it. So
> instead of originally-signed objects whose signatures are now
> invalid, "fast-export | fast-import" pipeline would give you
> originally-signed objects whose signatures are stripped.
I need to merge two unrelated repos and I am using `reposurgeon`
http://www.catb.org/~esr/reposurgeon/repository-editing.html
to do this preserving timestamps and commit order. The model of
operation is that it reads revisions into memory from git using
fast-export, operates on them, and then rebuild the stream back
into git repo with fast-import. The problem is that in the exported
dump the information is already lost, and the resulting commits are
"not mergeable". Basically all GitHub repositories where people
edited `README.md` online are "not mergeable" after this point,
because all GitHub edited commits are signed.
For my use case, where I just need to attach another branch in
time without altering original commits in any way, `reposurgeon`
can not be used.
> Admittedly, there is a narrow use case where such a signature
> invalidation is not an issue. If you run fast-export and feed that
> straight into fast-import without doing any modification to the
> stream, then you are getting a bit-for-bit identical copy.
I did just that and signatures got stripped, altering history.
git -C protonfixes fast-export --all --reencode=no | (cd
protoimported && git fast-import)
--
anatoly t.
next prev parent reply other threads:[~2021-03-03 14:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-27 12:31 Round-tripping fast-export/import changes commit hashes anatoly techtonik
2021-02-27 17:48 ` Elijah Newren
2021-02-28 10:00 ` anatoly techtonik
2021-02-28 10:34 ` Ævar Arnfjörð Bjarmason
2021-03-01 7:44 ` anatoly techtonik
2021-03-01 17:34 ` Junio C Hamano
2021-03-02 21:52 ` anatoly techtonik [this message]
2021-03-03 7:13 ` Johannes Sixt
2021-03-04 0:55 ` Junio C Hamano
2021-08-09 15:45 ` anatoly techtonik
2021-08-09 18:15 ` Elijah Newren
2021-08-10 15:51 ` anatoly techtonik
2021-08-10 17:57 ` Elijah Newren
2022-12-11 18:30 ` anatoly techtonik
2023-01-13 7:21 ` Elijah Newren
2021-03-01 18:06 ` Elijah Newren
2021-03-01 20:04 ` Ævar Arnfjörð Bjarmason
2021-03-01 20:17 ` Elijah Newren
2021-03-02 22:12 ` anatoly techtonik
2021-03-01 20:02 ` Ævar Arnfjörð Bjarmason
2021-03-02 22:23 ` anatoly techtonik
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='CAPkN8xKM0zi-AB1xKRGp=whEQTZAbn78w0JjvUXfGfRDky0C=w@mail.gmail.com' \
--to=techtonik@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@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).