]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1edda9 8151f4f)
Merge branch 'ps/receive-pack-updateinstead-in-worktree'
authorJunio C Hamano <gitster@pobox.com>
Tue, 7 Apr 2026 21:59:27 +0000 (14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Apr 2026 21:59:27 +0000 (14:59 -0700)
The check in "receive-pack" to prevent a checked out branch from
getting updated via updateInstead mechanism has been corrected.

* ps/receive-pack-updateinstead-in-worktree:
  receive-pack: use worktree HEAD for updateInstead
  t5516: clean up cloned and new-wt in denyCurrentBranch and worktrees test
  t5516: test updateInstead with worktree and unborn bare HEAD

1  2 
builtin/receive-pack.c patch | diff1 | diff2 | blob | history

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