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

git annex add in adjusted unlocked branch

Browse source 
Cached the current branch lookup just because it seems unnecessary overhead
to run an extra git command per add to query the current branch.
This commit is contained in:
Joey Hess 2016-03-29 13:26:06 -04:00
parent 4226ae1040
commit 42b7ccc89f
Failed to extract signature
4 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/AdjustedBranch.hs
View file

@ -12,6 +12,7 @@ module Annex.AdjustedBranch (
originalToAdjusted,
adjustedToOriginal,
fromAdjustedBranch,
getAdjustment,
enterAdjustedBranch,
updateAdjustedBranch,
propigateAdjustedCommits,
@ -45,7 +46,7 @@ data Adjustment
| LockAdjustment
| HideMissingAdjustment
| ShowMissingAdjustment
deriving (Show)
deriving (Show, Eq)
reverseAdjustment :: Adjustment -> Adjustment
reverseAdjustment UnlockAdjustment = LockAdjustment
@ -122,6 +123,9 @@ adjustedToOriginal b
bs = fromRef b
prefixlen = length adjustedBranchPrefix
getAdjustment :: Branch -> Maybe Adjustment
getAdjustment = fmap fst . adjustedToOriginal
fromAdjustedBranch :: Branch -> OrigBranch
fromAdjustedBranch b = maybe b snd (adjustedToOriginal b)