After new release git 2.39.1 ubuntu version git-crypt not working merge command

[viniciustrainottiobjective]

Hi,

After to updated git version to 2.39.1 ubuntu focal version the git-crypt not working for merge command.

> GIT_CURL_VERBOSE=1 GIT_TRACE=1 git merge master
14:35:12.818355 git.c:460               trace: built-in: git merge master
14:35:12.998825 run-command.c:655       trace: run_command: '"git-crypt" clean'
14:35:13.003634 git.c:460               trace: built-in: git rev-parse --git-dir
14:35:13.008099 run-command.c:655       trace: run_command: git stash create
14:35:13.010771 git.c:460               trace: built-in: git stash create
14:35:13.017251 run-command.c:655       trace: run_command: '"git-crypt" clean'
14:35:13.022418 git.c:460               trace: built-in: git rev-parse --git-dir
fatal: stash failed

My config .git/config file

[...]
[filter "git-crypt"]
	smudge = \"git-crypt\" smudge
	clean = \"git-crypt\" clean
	required = true
[diff "git-crypt"]
	textconv = \"git-crypt\" diff
[...]

Any idea for bug git-crypt?

[viniciustrainottiobjective]

I don't see tests in repo for compatibilites for git 2.39.1, anyone know if exists problem in this version for git-crypt?

[sjagoe]

I've had issues on a large repository, but have not yet been able to produce a reliable demonstration of the issue with a non-critical repository.

[ebuildy]

could you try to rebase instead merge ? In my case, this is a bug because an encrypted file have been removed from the target branch

[julien-sarazin]

Same problem here, on Mac OS Ventura 13.4 git version 2.41.0 git-crypt 0.7.0

[anero]

I was having a similar problem when attempting to merge my trunk branch into a branch where I'd added git-crypt. In case it's useful for somebody else, for me it was fixed when I locked the files before running the merge.

[julien-sarazin]

FINALLY! Thanks a lot, @anero! You're the man 👍