From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: anatoly techtonik <techtonik@gmail.com>
Cc: Elijah Newren <newren@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: Round-tripping fast-export/import changes commit hashes
Date: Sun, 28 Feb 2021 11:34:44 +0100 [thread overview]
Message-ID: <87mtvolbuj.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <CAPkN8xK9__74a3aEFsevfdW_hQ-vzWE+c=QypRacTktuZOfdSw@mail.gmail.com>
On Sun, Feb 28 2021, anatoly techtonik wrote:
> On Sat, Feb 27, 2021 at 8:49 PM Elijah Newren <newren@gmail.com> wrote:
>>
>> Your second commit is signed. Fast-export strips any extended headers
>> on commits, such as GPG signatures, because there's no way to keep
>> them in general.
>
> Why is it not possible to encode them with base64 and insert into the
> stream?
I think Elijah means that in the general case people are using fast
export/import to export/import between different systems or in
combination with a utility like git-filter-repo.
In those cases users are also changing the content of the repository, so
the hashes will change, invalidating signatures.
But there's also cases where e.g. you don't modify the history, or only
part of it, and could then preserve these headers. I think there's no
inherent reason not to do so, just that nobody's cared enough to submit
patches etc.
>> There are also other things that will prevent a simple fast-export |
>> fast-import pipeline from preserving your history as-is besides signed
>> commits (most of these are noted in the "Inherited Limitations"
>> section over at
>> https://htmlpreview.github.io/?https://github.com/newren/git-filter-repo/blob/docs/html/git-filter-repo.html):
>
> Is there any way to check what commits will be altered as a result of
> `fast-export` and why? Right now I don't see that it is reported.
I don't think so, but not being very familiar with fast export/import I
don't see why it shouldn't have some option to not munge data like that,
or to report it, if someone cared enough to track those issues & patch
it...
>> Hope that at least explains things for you, even if it doesn't give
>> you a workaround or a solution.
>
> Thanks. That is very helpful to know.
>
> The reason I am asking is because I tried to merge two repos with
> `reposurgeon` which operates on `fast-export` data. It is basically
> merging GitHub wiki into main repo,
>
> After successfully merging them I still can not send a PR, because
> it produces a huge amount of changes, because of the stripped info.
> It can be seen here:
>
> https://github.com/simons-public/protonfixes/compare/master...techtonik:master
>
> I tracked this behaviour in `reposurgeon` in this issue
> https://gitlab.com/esr/reposurgeon/-/issues/344
next prev parent reply other threads:[~2021-02-28 10:35 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 [this message]
2021-03-01 7:44 ` anatoly techtonik
2021-03-01 17:34 ` Junio C Hamano
2021-03-02 21:52 ` anatoly techtonik
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mtvolbuj.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=techtonik@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.
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 NNTP newsgroup(s).