Why does a merge without changes seem to effect other files?

[halloleo]

I'm using templates more now. 😄 But some things i don't understand.

Say, I have a source directory with one changed file (merge_for_chezmoi - not a template) and the destination directory with another changed file (.bash_machine - from a template) changed.

I start a merge (with VS Code):

cz merge ~/.bash_machine

I realise during the merge that .bash_machine comes from a template, so I exit without any changes; However despite this I get on the command line the info:

[main 608a936] Update .bash_machine Update merge_for_chezmoi
2 files changed, 1 insertion(+), 3 deletions(-)

This must come from git. Why's that?

PS: I do use

[git]
    autoAdd = true
    autoCommit = true

but I haven't changed anything during the merge, so why does git get involved now?

[twpayne]

chezmoi's auto-add and auto-commit add and commit all the changes in the source directory. You can look at the commit to see what you changed.

[halloleo]

Ahhhh, I see! The culprit was merge_for_chezmoi which I had changed -- a file different to the one I was merging.

Thanks for pointing out that all changes are auto-committed.