mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
27884 commits 13 branches 451 tags 137 MiB
Commit graph

7 commits

Author SHA1 Message Date
Joey Hess
766728c8cf
unify handling of unusual GIT_INDEX_FILE relative path 
This is probably a git bug that stuck in its interface.
 2016-05-17 14:42:06 -04:00
Joey Hess
e91037a38b
use indexEnv 2016-05-17 13:38:04 -04:00
Joey Hess
93c03b5dd5
Work around git bug in handling of relative path to GIT_INDEX_FILE when in a subdirectory of the repository. 
This affected git annex view. It turns out that some other places
that use GIT_INDEX_FILE were already working around the bug. I removed the
workaround from Annex.Branch since the new workaround will do.
 2016-05-17 13:29:51 -04:00
Joey Hess
0273cd5005
adjusted branches need git 2.2.0 or newer 
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.
 2016-04-22 12:29:32 -04:00
Joey Hess
251405eca2
avoid withWorkTreeRelated affecting annex symlink calculation 2016-04-08 14:24:00 -04:00
Joey Hess
60bdffe43e
fix auto merge conflict resolution when doing out of tree merge for adjusted branch 2016-04-06 17:32:04 -04:00
Joey Hess
b9e4e2ba84
new method for merging changes into adjusted branch that avoids unncessary merge conflicts 
Still needs work when there are actual merge conflicts.
 2016-04-06 15:36:18 -04:00