From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Jun 2023 23:29:05 +0000 (-0700)
Subject: Merge branch 'ja/worktree-orphan'
X-Git-Tag: v2.42.0-rc0~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4dd046932835d14c449f04ee0f3885669cad60c5;p=thirdparty%2Fgit.git

Merge branch 'ja/worktree-orphan'

'git worktree add' learned how to create a worktree based on an
orphaned branch with `--orphan`.

* ja/worktree-orphan:
  worktree add: emit warn when there is a bad HEAD
  worktree add: extend DWIM to infer --orphan
  worktree add: introduce "try --orphan" hint
  worktree add: add --orphan flag
  t2400: add tests to verify --quiet
  t2400: refactor "worktree add" opt exclusion tests
  t2400: cleanup created worktree in test
  worktree add: include -B in usage docs
---

4dd046932835d14c449f04ee0f3885669cad60c5
diff --cc builtin/worktree.c
index 60e389aaed,5f62084334..2931cd0230
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@@ -1,8 -1,8 +1,9 @@@
  #include "cache.h"
  #include "abspath.h"
+ #include "advice.h"
  #include "checkout.h"
  #include "config.h"
 +#include "copy.h"
  #include "builtin.h"
  #include "dir.h"
  #include "environment.h"
@@@ -14,7 -12,7 +15,8 @@@
  #include "strvec.h"
  #include "branch.h"
  #include "refs.h"
+ #include "remote.h"
 +#include "repository.h"
  #include "run-command.h"
  #include "hook.h"
  #include "sigchain.h"