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

git-history(1) fixup broken with worktrees?

From
Toon Claes <toon@iotcl.com>
Date
Jul 17, 2026, 18:54 UTC
Message-ID
<87jyqt1m6g.fsf@emacs.iotcl.com>
Hi,
Imagine this repoducer:
    $ git init
    $ echo Hello > README
    $ git add .
    $ git commit -m'initial commit'
    $ git worktree add ../feature
    $ echo world >> README
    $ git add .
    $ git history fixup HEAD
    $ cd ../feature
Now running git-status(1) in that other worktree gives me:
    $ git status
    On branch feature
    Changes to be committed:
      (use "git restore --staged <file>..." to unstage)
            modified:   README
And:
    $ git diff --staged
    diff --git a/README b/README
    index 65a56c3..e965047 100644
    --- a/README
    +++ b/README
    @@ -1,2 +1 @@
     Hello
    -world

So suddenly my other worktree is dirty? With staged changes? And I didn't even touch it.

Now the commit history is correct:
    $ git log --graph --oneline --all
    * 16ef548 (HEAD -> feature, main) initial commit
-- 
Cheers,
Toon
Next: Phillip Wood
Message 1 of 4 in “git-history(1) fixup broken with worktrees?”
  1. Toon ClaesJul 17, 2026
  2. Phillip WoodJul 18, 2026
  3. Toon ClaesJul 28, 2026
  4. Patrick SteinhardtAug 20, 2026

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.