diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-27 11:00:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-27 11:00:01 -0700 |
| commit | 828988bef368456e613a0e0bb5f1ba9580a6b341 (patch) | |
| tree | b73797b92169dd65ad60298d2f53ef97b903a6ba | |
| parent | 968e62c18794535f9b010d3075806f0950aa16bb (diff) | |
| parent | 57246b7c626c18bad5f7a36b9479dea58b73242d (diff) | |
| download | git-828988bef368456e613a0e0bb5f1ba9580a6b341.tar.xz | |
Merge branch 'mr/merge-file-object-id-worktree-fix'
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
| -rw-r--r-- | builtin/merge-file.c | 3 | ||||
| -rwxr-xr-x | t/t6403-merge-file.sh | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 084fdfec58..59a9792208 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -108,7 +108,8 @@ int cmd_merge_file(int argc, return error_errno("failed to redirect stderr to /dev/null"); } - if (object_id) + if (!repo && object_id) + /* emit the correct "not a git repo" error in this case */ setup_git_directory(); for (i = 0; i < 3; i++) { diff --git a/t/t6403-merge-file.sh b/t/t6403-merge-file.sh index 4d6e748320..801284cf8f 100755 --- a/t/t6403-merge-file.sh +++ b/t/t6403-merge-file.sh @@ -542,6 +542,15 @@ test_expect_success '--object-id fails without repository' ' grep "not a git repository" err ' +test_expect_success 'run in a linked worktree with --object-id' ' + empty="$(test_oid empty_blob)" && + git worktree add work && + git -C work merge-file --object-id $empty $empty $empty >actual && + git worktree remove work && + git merge-file --object-id $empty $empty $empty >expected && + test_cmp actual expected +' + test_expect_success 'merging C files with "myers" diff algorithm creates some spurious conflicts' ' cat >expect.c <<-\EOF && int g(size_t u) |