git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: How to use filter-branch with --state-branch?

From
Ian Campbell <ijc@hellion.org.uk>
Date
Mar 8, 2018, 09:40 UTC
Message-ID
<1520502026.23648.29.camel@hellion.org.uk>
In-Reply-To
<87zi3inckw.fsf@evledraar.gmail.com>
On Thu, 2018-03-08 at 10:25 +0100, Ævar Arnfjörð Bjarmason wrote:
> > The first filter-branch call required 7168 steps, so did the second call...
> > I also tried without the --prune option of remote update (I had to add
> > --force to the second filter-branch), but nothing changed.
You can see an example of the usage in:
    https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/

in the `scripts/` sub dir (flow is `cronjob` → `filter.sh` → `git filter-branch...`.

I think the big difference is rather than `--all` you need to give it the `previous..now` range since that is the update you wish to do (first time around you just give it `now`).

The devicetree-rebasing scripting arranges that by keeping the previous in a separate branch.

Ian.
Previous: Ævar Arnfjörð BjarmasonNext: Michele Locati
Message 3 of 6 in “How to use filter-branch with --state-branch?”
  1. Michele LocatiMar 6, 2018
  2. Ævar Arnfjörð BjarmasonMar 8, 2018
  3. Ian CampbellMar 8, 2018
  4. Michele LocatiMar 9, 2018
  5. Ian CampbellMar 9, 2018
  6. Michele LocatiMar 9, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.