e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
48 lines
1.1 KiB
Haskell
48 lines
1.1 KiB
Haskell
{- git-union-merge program
|
|
-
|
|
- Copyright 2011 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
import System.Environment
|
|
|
|
import Common
|
|
import qualified Git.UnionMerge
|
|
import qualified Git.Config
|
|
import qualified Git.CurrentRepo
|
|
import qualified Git.Branch
|
|
import qualified Git.Index
|
|
import qualified Git
|
|
|
|
header :: String
|
|
header = "Usage: git-union-merge ref ref newref"
|
|
|
|
usage :: IO a
|
|
usage = error $ "bad parameters\n\n" ++ header
|
|
|
|
tmpIndex :: Git.Repo -> FilePath
|
|
tmpIndex g = Git.localGitDir g </> "index.git-union-merge"
|
|
|
|
setup :: Git.Repo -> IO ()
|
|
setup = cleanup -- idempotency
|
|
|
|
cleanup :: Git.Repo -> IO ()
|
|
cleanup g = nukeFile $ tmpIndex g
|
|
|
|
parseArgs :: IO [String]
|
|
parseArgs = do
|
|
args <- getArgs
|
|
if length args /= 3
|
|
then usage
|
|
else return args
|
|
|
|
main :: IO ()
|
|
main = do
|
|
[aref, bref, newref] <- map Git.Ref <$> parseArgs
|
|
g <- Git.Config.read =<< Git.CurrentRepo.get
|
|
_ <- Git.Index.override $ tmpIndex g
|
|
setup g
|
|
Git.UnionMerge.merge aref bref g
|
|
_ <- Git.Branch.commit "union merge" newref [aref, bref] g
|
|
cleanup g
|