Protect local branches from git branch -d when a surviving branch depends on them through a local upstream chain. Harald Nordgren (2): branch: move stacked branch helpers branch: protect local upstreams from -d Documentation/git-branch.adoc | 4 +- builtin/branch.c | 142 +++++++++++++++++++++------------- t/t1507-rev-parse-upstream.sh | 4 +- t/t3200-branch.sh | 43 ++++++++++ t/t6040-tracking-info.sh | 2 +- 5 files changed, 137 insertions(+), 58 deletions(-) base-commit: 2c3adbb2c475981e340c79fdc5e7f4f9b5d9054e Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2365%2FHaraldNordgren%2Fbranch-d-protect-stacked-upstreams-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2365/HaraldNordgren/branch-d-protect-stacked-upstreams-v1 Pull-Request: https://github.com/git/git/pull/2365 -- gitgitgadget