]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pb/subtree-split-and-merge-after-squashing-tag-fix'
authorTaylor Blau <me@ttaylorr.com>
Mon, 31 Oct 2022 01:04:43 +0000 (21:04 -0400)
committerTaylor Blau <me@ttaylorr.com>
Mon, 31 Oct 2022 01:04:43 +0000 (21:04 -0400)
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'


Trivial merge