diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-09 14:17:20 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-09 14:17:20 -0400 |
| commit | 8fd4c4e849c43ff000d93e32f6aaa78be906f6ce (patch) | |
| tree | ba2d15ff5208f6013042352165de1c5e18b99fdc /Annex | |
| parent | dcf717f6055c21cc4ad05d692de8c7884a8c7489 (diff) | |
change name of basis branch
Making the name look too much like the adjusted branch was ambiguous.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/AdjustedBranch.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index c92c528c1..dc35e8325 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -106,10 +106,10 @@ type AdjBranch = Branch newtype BasisBranch = BasisBranch Ref -- The basis for refs/heads/adjusted/master(unlocked) is --- refs/adjusted/master(unlocked). +-- refs/basis/adjusted/master(unlocked). basisBranch :: AdjBranch -> BasisBranch basisBranch adjbranch = BasisBranch $ - Ref ("refs/" ++ fromRef (Git.Ref.base adjbranch)) + Ref ("refs/basis/" ++ fromRef (Git.Ref.base adjbranch)) adjustedBranchPrefix :: String adjustedBranchPrefix = "refs/heads/adjusted/" |