[Dev] [FYI] Rewriting iceweasel.git history

Luke Shumaker lukeshu at lukeshu.com
Wed Oct 24 01:07:45 GMT 2018

Hello all,

The patchset & files to turn Mozilla Firefox in to Parabola Iceweasel
has at different times been developed at
<https://git.parabola.nu/packages/iceweasel.git> and at

I don't like having these two separate histories.  So, I've grafted
the histories together, using the attached script to use `git replace`
to stitch them together, then fast-export/fast-import to rewrite the
commits using those replacements.  Something like:

    git init iceweasel-old
    cd iceweasel-old
    git remote add iceweasel https://git.parabola.nu/packages/iceweasel.git
    git remote add iceweasel-branding https://git.parabola.nu/packages/iceweasel-branding.git
    git fetch --all
    git checkout -b master iceweasel-branding/master
    git fast-export $(git for-each-ref --format="%(refname)" refs/heads refs/tags) > ../iceweasel.fi
    git init ../iceweasel-new
    cd ../iceweasel-new
    git fast-import < ../iceweasel.fi

<https://git.parabola.nu/packages/iceweasel.git> now contains the new
spliced-together history, and the untouched separate histories have
been moved to <https://git.parabola.nu/~emulatorman/iceweasel.git> and

So, if a `git pull` says something looks fishy about iceweasel.git,
that's what it is.

Happy hacking,
~ Luke Shumaker
-------------- next part --------------
A non-text attachment was scrubbed...
Name: iceweasel-graft.sh
Type: application/octet-stream
Size: 2047 bytes
Desc: not available
URL: <https://lists.parabola.nu/pipermail/dev/attachments/20181023/2e349836/attachment.obj>

More information about the Dev mailing list