]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Jul 2022 15:38:42 +0000 (08:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jul 2022 15:38:42 +0000 (08:38 -0700)
* ds/branch-checked-out:
  branch: drop unused worktrees variable
  fetch: stop passing around unused worktrees variable
  branch: fix branch_checked_out() leaks
  branch: use branch_checked_out() when deleting refs
  fetch: use new branch_checked_out() and add tests
  branch: check for bisects and rebases
  branch: add branch_checked_out() helper

1  2 
branch.c
branch.h
builtin/fetch.c

diff --cc branch.c
Simple merge
diff --cc branch.h
Simple merge
diff --cc builtin/fetch.c
Simple merge