summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-08-31 18:06:49 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-08-31 18:06:49 -0400
commit441a5dfc2fd112fd165b95fb1106f15a1255e72a (patch)
tree856b1ee18a302d8d781b3094833ed5990ee1981d /Annex
parentc9629ab97875721c8d36bdaceec25768de610b5e (diff)
graft exported tree into git-annex branch
So it will be available later and elsewhere, even after GC. I first though to use git update-index to do this, but feeding it a line with a tree object seems to always cause it to generate a git subtree merge. So, fell back to using the Git.Tree interface to maniupulate the trees, and not involving the git-annex branch index file at all. This commit was sponsored by Andreas Karlsson.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Branch.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index 5482dc44b..5214df627 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -21,6 +21,7 @@ module Annex.Branch (
maybeChange,
commit,
forceCommit,
+ getBranch,
files,
withIndex,
performTransitions,