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

Merge branch 'master' into desymlink

Browse source
This commit is contained in:
Joey Hess 2012-12-18 12:36:29 -04:00
commit d62a58b9c8
4 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/Vicfg.hs
View file

@ -44,7 +44,7 @@ vicfg :: Cfg -> FilePath -> Annex ()
vicfg curcfg f = do
vi <- liftIO $ catchDefaultIO "vi" $ getEnv "EDITOR"
-- Allow EDITOR to be processed by the shell, so it can contain options.
unlessM (liftIO $ boolSystem "sh" [Param "-c", Param $ unwords [vi, f]]) $
unlessM (liftIO $ boolSystem "sh" [Param "-c", Param $ unwords [vi, shellEscape f]]) $
error $ vi ++ " exited nonzero; aborting"
r <- parseCfg curcfg <$> liftIO (readFileStrict f)
liftIO $ nukeFile f

1
debian/changelog vendored
View file

@ -6,6 +6,7 @@ git-annex (3.20121212) UNRELEASED; urgency=low
git and git-annex commands do not work, or can even cause data loss in
direct mode.
* kqueue: Fix bug that made broken symlinks not be noticed.
* vicfg: Quote filename. Closes: #696193
-- Joey Hess <joeyh@debian.org> Thu, 13 Dec 2012 14:06:43 -0400

26
doc/design/assistant/blog/day_153__hibernation.mdwn Normal file
View file

@ -0,0 +1,26 @@
As winter clouds set in, I have to ration my solar power and have been less
active than usual.
It seems that the OSX 10.8.2 `git init` hanging issue has indeed been
resolved, by building the app on 10.8.2. Very good news! Autobuilder setup is
in progress.
----
Finally getting stuck in to direct mode git-merge handling. It's
not possible to run `git merge` in a direct mode tree, because it'll
see typechanged files and refuse to do anything.
So the only way to use `git merge`, rather than writing my own merge engine,
is to use `--work-tree` to make it operate in a temporary work tree directory
rather than the real one.
When it's run this way, any new, modified, or renamed files will be added
to the temp dir, and will need to be moved to the real work tree.
To detect deleted files, need to use `git ls-files --others`, and
look at the old tree to see if the listed files were in it.
When a merge conflict occurs, the new version of the file will be in the temp
directory, and the old one in the work tree. The normal automatic merge
conflict resolution machinery should work, with just some tweaks to handle
direct mode.

6
doc/install/OSX.mdwn
View file

@ -11,11 +11,15 @@ reports.
## autobuilds
[Jimmy Tang](http://www.sgenomics.org/~jtang/) autobuilds
the app. These autobuilds only work on OSX Lion, not Mountain Lion.
the app for OSX Lion.
* [autobuild of git-annex.app](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/ref/master/git-annex.dmg.bz2) ([build logs](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/))
* [past builds](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/sha1/) -- directories are named from the commitid's
[[Joey]] autobuilds the app for Mountain Lion.
* [autobuild of git-annex.app](http://downloads.kitenet.net/git-annex/OSX/autobuild/git-annex.dmg.bz2) ([build logs](http://downloads.kitenet.net/git-annex/OSX/autobuild/))
## using Brew
<pre>