mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

assistant: Deal with upcoming git's refusal to merge unrelated histories by default

Browse source 
git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from merging in
unrelated branches. Since the webapp's pairing etc features often combine
together repositories with unrelated histories, work around this behavior
change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES when the assistant
merges.

Note though that this is not done for git annex sync's merges, so
it will follow git's default or configured behavior.
This commit is contained in:
Joey Hess 2016-04-22 14:26:44 -04:00
parent 8ab27235ea
commit 46e3319995
Failed to extract signature
9 changed files with 90 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

7
debian/changelog vendored
View file

@ -16,6 +16,13 @@ git-annex (6.20160419) UNRELEASED; urgency=medium
* When git-annex is used with a git version older than 2.2.0, disable
support for adjusted branches, since GIT_COMMON_DIR is needed to update
them and was first added in that version of git.
* git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from
merging in unrelated branches. Since the webapp's pairing etc features
often combine together repositories with unrelated histories, work around
this behavior change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES
when the assistant merges. Note though that this is not done for
git annex sync's merges, so it will follow git's default or configured
behavior.
-- Joey Hess <id@joeyh.name> Tue, 19 Apr 2016 12:57:15 -0400