]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'cw/worktree-extension'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Dec 2024 15:33:43 +0000 (07:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Dec 2024 15:33:43 +0000 (07:33 -0800)
Introduce a new repository extension to prevent older Git versions
from mis-interpreting worktrees created with relative paths.

* cw/worktree-extension:
  worktree: refactor `repair_worktree_after_gitdir_move()`
  worktree: add relative cli/config options to `repair` command
  worktree: add relative cli/config options to `move` command
  worktree: add relative cli/config options to `add` command
  worktree: add `write_worktree_linking_files()` function
  worktree: refactor infer_backlink return
  worktree: add `relativeWorktrees` extension
  setup: correctly reinitialize repository version

1  2 
builtin/worktree.c
t/t0001-init.sh
t/t2400-worktree-add.sh
t/t2401-worktree-prune.sh
t/t2402-worktree-list.sh
t/t2403-worktree-move.sh
t/t2406-worktree-repair.sh
t/t5504-fetch-receive-strict.sh

Simple merge
diff --cc t/t0001-init.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge