]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 265cb7b 57246b7)
Merge branch 'mr/merge-file-object-id-worktree-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2026 21:49:13 +0000 (14:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2026 21:49:13 +0000 (14:49 -0700)
merge-file --object-id used to trigger a BUG when run in a linked
worktree, which has been fixed.

* mr/merge-file-object-id-worktree-fix:
  merge-file: fix BUG when --object-id is used in a worktree

1  2 
builtin/merge-file.c patch | diff1 | diff2 | blob | history
t/t6403-merge-file.sh patch | diff1 | diff2 | blob | history

diff --cc builtin/merge-file.c
Simple merge
diff --cc t/t6403-merge-file.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.