diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-22 14:26:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-22 14:26:44 -0400 |
| commit | c4b2bd9869c4cc1ae036e5be9d1032fb1ee99804 (patch) | |
| tree | 86a1e3cc74561e7dd9c16855e53685a8f001b284 /debian | |
| parent | b48a044d26bb607da9962b9086e9da2db9e11620 (diff) | |
assistant: Deal with upcoming git's refusal to merge unrelated histories by default
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.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index accb890b3..0775a1270 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |