Commit history duplicated, seeing weird diffusion activity (Was: [Diffusion] rG67c416dc9a5a: [DebugInfo] Allow spill slots in call site parameter descriptions)

I just got a Diffusion notification about a change of mine being reverted by Fangrui, but I'm not sure that's actually what happened and am confused and concerned.

My commit was "[DebugInfo] Allow spill slots in call site parameter descriptions", and it appears in the history under two hashes: 1ee84e and 67c416. The first commit contains the actual change. The second touches something in yaml2obj, which I promise I did not do:

$ g show 67c416dc9a5aeda034d46bdcb3b63fffa462d28e
commit 67c416dc9a5aeda034d46bdcb3b63fffa462d28e
Author: Vedant Kumar <vsk@apple.com>

    [DebugInfo] Allow spill slots in call site parameter descriptions
    
    [snip]

diff --git a/llvm/test/tools/yaml2obj/coff-xrelocs.yaml b/llvm/test/tools/yaml2obj/COFF/xrelocs.yaml
similarity index 100%
rename from llvm/test/tools/yaml2obj/coff-xrelocs.yaml
rename to llvm/test/tools/yaml2obj/COFF/xrelocs.yaml

Does anyone know what happened?

thanks,
vedant

I am also very confused about

rename from llvm/test/tools/yaml2obj/coff-xrelocs.yaml
rename to llvm/test/tools/yaml2obj/COFF/xrelocs.yaml

It may be due to my misoperation.

git checkout master; git merge --ff objcopy-redefine-sym && git push
# to push the commit "[llvm-objcopy][MachO] Implement --redefine-sym
and --redefine-syms"
I intended to append the worktree change to another branch
yaml2obj-move but probably accidentally amended master.
Sorry for causing the confusion.

Ahh ok, no problem. Still not sure I understand exactly how the fast-forward duplicated the message from 1ee84e, but it doesn't look like there's any issue with the repo or tooling, so my main concern is assuaged.

thanks
vedant