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

34 lines
820 B
Haskell
Raw Normal View History

sync: Avoid recent git's interactive merge.
2012-06-23 14:22:56 +00:00
{- git merging
-
avoid bad commits after interrupted direct mode sync (or merge) It was possible for a interrupted sync or merge in direct mode to leave the work tree out of sync with the last recorded commit. This would result in the next commit seeing files missing from the work tree, and committing their removal. Now, a direct mode merge happens not only in a throwaway work tree, but using a temporary index file, and without any commits or index changes being made until the real work tree has been updated. If the merge is interrupted, the work tree may have some updated files, but worst case a commit will redundantly commit changes that come from the merge. This commit was sponsored by Tony Cantor.
2014-06-09 22:01:30 +00:00
- Copyright 2012, 2014 Joey Hess <joey@kitenet.net>
sync: Avoid recent git's interactive merge.
2012-06-23 14:22:56 +00:00
-
- Licensed under the GNU GPL version 3 or higher.
-}
module Git.Merge where
import Common
import Git
import Git.Command
better git version checking
2013-08-02 22:31:01 +00:00
import Git.BuildVersion
sync: Avoid recent git's interactive merge.
2012-06-23 14:22:56 +00:00
{- Avoids recent git's interactive merge. -}
mergeNonInteractive :: Ref -> Repo -> IO Bool
avoid --no-edit with older git versions
2012-07-17 18:50:37 +00:00
mergeNonInteractive branch
remove Read instance for Ref Removed instance, got it all to build using fromRef. (With a few things that really need to show something using a ref for debugging stubbed out.) Then added back Read instance, and made Logs.View use it for serialization. This changes the view log format.
2014-02-19 05:09:17 +00:00
| older "1.7.7.6" = merge [Param $ fromRef branch]
| otherwise = merge [Param "--no-edit", Param $ fromRef branch]
git subcommand cleanup Pass subcommand as a regular param, which allows passing git parameters like -c before it. This was already done in the pipeing set of functions, but not the command running set.
2013-03-03 17:39:07 +00:00
where
merge ps = runBool $ Param "merge" : ps
avoid bad commits after interrupted direct mode sync (or merge) It was possible for a interrupted sync or merge in direct mode to leave the work tree out of sync with the last recorded commit. This would result in the next commit seeing files missing from the work tree, and committing their removal. Now, a direct mode merge happens not only in a throwaway work tree, but using a temporary index file, and without any commits or index changes being made until the real work tree has been updated. If the merge is interrupted, the work tree may have some updated files, but worst case a commit will redundantly commit changes that come from the merge. This commit was sponsored by Tony Cantor.
2014-06-09 22:01:30 +00:00
{- Stage the merge into the index, but do not commit it.-}
stageMerge :: Ref -> Repo -> IO Bool
stageMerge branch = runBool
[ Param "merge"
, Param "--quiet"
, Param "--no-commit"
-- Without this, a fast-forward merge is done, since it involves no
-- commit.
, Param "--no-ff"
, Param $ fromRef branch
]
Reference in a new issue Copy permalink