git/contrib/subtree, branch v2.26.1

contrib/subtree: ensure only one rev is provided

2019-03-12T08:38:03Z

While looking at the inline help for git-subtree.sh, I noticed that git subtree split --prefix= was given as an option. However, it only really makes sense to provide one revision because of the way the commits are forwarded to rev-parse so change "" to "" to reflect this. In addition, check the arguments to ensure that only one rev is provided for all subcommands that accept a commit. Signed-off-by: Denton Liu Acked-by: Avery Pennarun Signed-off-by: Junio C Hamano

Merge branch 'ch/subtree-build'

2018-10-30T06:43:40Z

Build update for "git subtree" (in contrib/) documentation pages. * ch/subtree-build: Revert "subtree: make install targets depend on build targets" subtree: make install targets depend on build targets subtree: add build targets 'man' and 'html'

Revert "subtree: make install targets depend on build targets"

2018-10-18T02:07:17Z

This reverts commit 744f7c4c314dc0e7816ac05520e8358c8318187a. These targets do depend on the fact that each prereq is explicitly listed via their use of $^, which I failed to notice, and broke the build.

subtree: make install targets depend on build targets

2018-10-16T08:00:42Z

Now that we have build targets let the install targets depend on them. Also make the targets phony. Signed-off-by: Christian Hesse Signed-off-by: Junio C Hamano

subtree: performance improvement for finding unexpected parent commits

2018-10-12T14:28:32Z

After testing a previous patch at larger scale, a performance issue was detected when using git show to locate parent revisions, with a single run of the git show command taking 2 seconds or longer in a complex repo. When the command is required tens or hundreds of times in a run of the script, the additional wait time is unaccepatable. Replacing the command with git rev-parse resulted in significantly increased performance, with the command in question returning instantly. Signed-off-by: Roger Strain Signed-off-by: Junio C Hamano

subtree: add build targets 'man' and 'html'

2018-10-10T02:21:47Z

We have targets 'install-man' and 'install-html', let's add build targets as well. Signed-off-by: Christian Hesse Signed-off-by: Junio C Hamano

subtree: improve decision on merges kept in split

2018-10-06T23:09:34Z

When multiple identical parents are detected for a commit being considered for copying, explicitly check whether one is the common merge base between the commits. If so, the other commit can be used as the identical parent; if not, a merge must be performed to maintain history. In some situations two parents of a merge commit may appear to both have identical subtree content with each other and the current commit. However, those parents can potentially come from different commit graphs. Previous behavior would simply select one of the identical parents to serve as the replacement for this commit, based on the order in which they were processed. New behavior compares the merge base between the commits to determine if a new merge commit is necessary to maintain history despite the identical content. Signed-off-by: Strain, Roger L Signed-off-by: Junio C Hamano

subtree: use commits before rejoins for splits

2018-10-06T23:09:34Z

Adds recursive evaluation of parent commits which were not part of the initial commit list when performing a split. Split expects all relevant commits to be reachable from the target commit but not reachable from any previous rejoins. However, a branch could be based on a commit prior to a rejoin, then later merged back into the current code. In this case, a parent to the commit will not be present in the initial list of commits, trigging an "incorrect order" warning. Previous behavior was to consider that commit to have no parent, creating an original commit containing all subtree content. This commit is not present in an existing subtree commit graph, changing commit hashes and making pushing to a subtree repo impossible. New behavior will recursively check these unexpected parent commits to track them back to either an earlier rejoin, or a true original commit. The generated synthetic commits will properly match previously-generated commits, allowing successful pushing to a prior subtree repo. Signed-off-by: Strain, Roger L Signed-off-by: Junio C Hamano

subtree: make --ignore-joins pay attention to adds

2018-10-06T23:09:34Z

Changes the behavior of --ignore-joins to always consider a subtree add commit, and ignore only splits and squashes. The --ignore-joins option is documented to ignore prior --rejoin commits. However, it additionally ignored subtree add commits generated when a subtree was initially added to a repo. Due to the logic which determines whether a commit is a mainline commit or a subtree commit (namely, the presence or absence of content in the subtree prefix) this causes commits before the initial add to appear to be part of the subtree. An --ignore-joins split would therefore consider those commits part of the subtree history and include them at the beginning of the synthetic history, causing the resulting hashes to be incorrect for all later commits. Signed-off-by: Strain, Roger L Signed-off-by: Junio C Hamano

subtree: refactor split of a commit into standalone method

2018-10-06T23:09:34Z

In a particularly complex repo, subtree split was not creating compatible splits for pushing back to a separate repo. Addressing one of the issues requires recursive handling of parent commits that were not initially considered by the algorithm. This commit makes no functional changes, but relocates the code to be called recursively into a new method to simply comparisons of later commits. Signed-off-by: Strain, Roger L Signed-off-by: Junio C Hamano