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

allow git-union-merge to write to any ref

Browse source 
Not just refs/heads/* branches.
This commit is contained in:
Joey Hess 2011-06-20 21:38:52 -04:00
parent d519bc7137
commit 01e8a0a9e5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/git-union-merge.mdwn
View file

@ -4,12 +4,12 @@ git-union-merge - Join branches together using a union merge
# SYNOPSIS
git union-merge branch ref ref
git union-merge newref ref ref
# DESCRIPTION
Does a union merge between two refs, storing the result in the
specified branch.
specified newref.
The union merge will always succeed, but assumes that files can be merged
simply by concacenating together lines from all the oldrefs, in any order.
@ -20,7 +20,7 @@ entirely on git refs and branches.
# EXAMPLE
git union-merge git-annex git-annex origin/git-annex
git union-merge refs/heads/git-annex git-annex origin/git-annex
Merges the current git-annex branch, and a version from origin,
storing the result in the git-annex branch.

4
git-union-merge.hs
View file

@ -19,7 +19,7 @@ import qualified GitRepo as Git
import Utility
header :: String
header = "Usage: git-union-merge branch ref ref"
header = "Usage: git-union-merge newref ref ref"
usage :: IO a
usage = error $ "bad parameters\n\n" ++ header
@ -109,7 +109,7 @@ commit g branch aref bref = do
sha <- getSha "commit-tree" $
pipeBoth "git" ["commit-tree", tree, "-p", aref, "-p", bref]
"union merge"
Git.run g "update-ref" [Param $ "refs/heads/" ++ branch, Param sha]
Git.run g "update-ref" [Param branch, Param sha]
{- Runs an action that causes a git subcommand to emit a sha, and strips
any trailing newline, returning the sha. -}