diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-03-05 10:43:02 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-03-05 10:43:03 -0800 |
commit | 4a2e91db652e197803c6f29e2c2f1c9dfbc16506 (patch) | |
tree | abae7a1c8eb6eeb0d57f561725122341c3e07fe7 /t/t4013/diff.diff-tree_--cc_master | |
parent | Merge branch 'es/worktree-avoid-duplication-fix' (diff) | |
parent | t2402: test worktree path when called in .git directory (diff) | |
download | tgif-4a2e91db652e197803c6f29e2c2f1c9dfbc16506.tar.xz |
Merge branch 'hv/receive-denycurrent-everywhere'
"git push" should stop from updating a branch that is checked out
when receive.denyCurrentBranch configuration is set, but it failed
to pay attention to checkouts in secondary worktrees. This has
been corrected.
* hv/receive-denycurrent-everywhere:
t2402: test worktree path when called in .git directory
receive.denyCurrentBranch: respect all worktrees
t5509: use a bare repository for test push target
get_main_worktree(): allow it to be called in the Git directory
Diffstat (limited to 't/t4013/diff.diff-tree_--cc_master')
0 files changed, 0 insertions, 0 deletions