From: Taylor Blau <me@ttaylorr.com>
Date: Mon, 31 Oct 2022 01:04:43 +0000 (-0400)
Subject: Merge branch 'pb/subtree-split-and-merge-after-squashing-tag-fix'
X-Git-Tag: v2.39.0-rc0~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a23e0b69e2d25a893e187d86719de0b12b324579;p=thirdparty%2Fgit.git

Merge branch 'pb/subtree-split-and-merge-after-squashing-tag-fix'

A bugfix to "git subtree" in its split and merge features.

* pb/subtree-split-and-merge-after-squashing-tag-fix:
  subtree: fix split after annotated tag was squashed merged
  subtree: fix squash merging after annotated tag was squashed merged
  subtree: process 'git-subtree-split' trailer in separate function
  subtree: use named variables instead of "$@" in cmd_pull
  subtree: define a variable before its first use in 'find_latest_squash'
  subtree: prefix die messages with 'fatal'
  subtree: add 'die_incompatible_opt' function to reduce duplication
  subtree: use 'git rev-parse --verify [--quiet]' for better error messages
  test-lib-functions: mark 'test_commit' variables as 'local'
---

a23e0b69e2d25a893e187d86719de0b12b324579