diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-08 15:34:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-08 16:27:20 -0400 |
| commit | bf460a0a98d7e4c7f4eac525fcf300629db582b6 (patch) | |
| tree | bff7cd09529c40fa8cb76fd92428cc41e24ad808 /git-union-merge.hs | |
| parent | 2ff8915365099501382183af9855e739fc234861 (diff) | |
reorder repo parameters last
Many functions took the repo as their first parameter. Changing it
consistently to be the last parameter allows doing some useful things with
currying, that reduce boilerplate.
In particular, g <- gitRepo is almost never needed now, instead
use inRepo to run an IO action in the repo, and fromRepo to get
a value from the repo.
This also provides more opportunities to use monadic and applicative
combinators.
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs index 0d1d0819d..10ae84217 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -41,6 +41,6 @@ main = do g <- Git.configRead =<< Git.repoFromCwd _ <- Git.useIndex (tmpIndex g) setup g - Git.UnionMerge.merge g aref bref - Git.commit g "union merge" newref [aref, bref] + Git.UnionMerge.merge aref bref g + Git.commit "union merge" newref [aref, bref] g cleanup g |