Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Windows: Deal with strange msysgit 1.8.4 behavior of not understanding DOS ↵ | Joey Hess | 2013-10-17 |
| | | | | formatted paths for --git-dir and --work-tree. | ||
* | avoid trying to link with XMPP on Windows | Joey Hess | 2013-10-17 |
| | | | | | It doesn't work, in a most puzzling way, which just wasted me hours, even if XMPP libs are installed. Webapp too. | ||
* | Revert "avoid hsc files on Windows" | Joey Hess | 2013-10-17 |
| | | | | | | This reverts commit 699a90bdc195a67c5aa5fca34fcaa07fb2b530ae. My windows build environment was broken; reverted to backup. | ||
* | typo | Joey Hess | 2013-10-17 |
| | |||
* | typo | Joey Hess | 2013-10-17 |
| | |||
* | avoid hsc files on Windows | Joey Hess | 2013-10-17 |
| | | | | | | | | | | This used to work, but now hsc2hs is failing with a usage message. Since I have not changed my windows build environment at all, it must be some change due to a change in the cabal file. Perhaps too make flags are causing it to hit a windows command line length limit? Anyway, these hsc files did nothing on Windows, so can be omitted and not built to work around yet another epic windows weirdness. | ||
* | avoid even trying to use nice on windows | Joey Hess | 2013-10-17 |
| | |||
* | note on nice | Joey Hess | 2013-10-17 |
| | |||
* | try working around windows xargs problem | Joey Hess | 2013-10-17 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-10-17 |
|\ | |||
* | | update for DiffTree type change (which fixes assistant in subdir confusion bug) | Joey Hess | 2013-10-17 |
| | | |||
* | | update for DiffTree type change | Joey Hess | 2013-10-17 |
| | | | | | | | | Experimentally, using the raw TopFilePath was right here. | ||
* | | update for DiffTree change | Joey Hess | 2013-10-17 |
| | | | | | | | | | | | | | | | | | | This actually fixes a bug; if pre-commit was run in a subdir, it would pass relative files when updating the associated file maps, and so the maps wouldn't update. I don't think this bug happened in practice, due to the way pre-commit is called by the hook. It happened to chdir to the top of the work tree. | ||
* | | update for LsTree type change | Joey Hess | 2013-10-17 |
| | | | | | | | | in the config monitor, we want files relative to the top of the working directory | ||
* | | use TopFilePath for DiffTree and LsTree | Joey Hess | 2013-10-17 |
| | | |||
* | | update | Joey Hess | 2013-10-17 |
| | | |||
* | | repro recipe | Joey Hess | 2013-10-17 |
| | | |||
* | | sync: fix crash on first sync when no branch exists yet | Joey Hess | 2013-10-17 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg | 2013-10-17 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM | 2013-10-16 |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-10-16 |
|\ | |||
* | | mini-devblog | Joey Hess | 2013-10-16 |
| | | |||
* | | moreinfo | Joey Hess | 2013-10-16 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-10-16 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-10-16 |
|/ | |||
* | S3: Try to ensure bucket name is valid for archive.org. | Joey Hess | 2013-10-16 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-10-16 |
|\ | |||
* | | test suite found a case that was not properly parsed | Joey Hess | 2013-10-16 |
| | | |||
* | | close | Joey Hess | 2013-10-16 |
| | | |||
* | | test case for a40e203f23a87bbc6d362d33734f1e4dcf645871 | Joey Hess | 2013-10-16 |
| | | |||
* | | fix indirect mode conflict merge when only one side is annexed file | Joey Hess | 2013-10-16 |
| | | | | | | | | | | git-merge's creation of file~HEAD type files did not make this especially nice to do. | ||
* | | ensure merge directory is empty before starting merge | Joey Hess | 2013-10-16 |
| | | | | | | | | Don't want some past failed merge to lead to bad results, potentially. | ||
* | | sync: Fix automatic resolution of merge conflicts where one side is an ↵ | Joey Hess | 2013-10-16 |
| | | | | | | | | | | | | | | | | | | annexed file, and the other side is a non-annexed file, or a directory. Note that this case is only fully automatically resolved in direct mode. In indirect mode, git merge moves the file to file~HEAD, and replaces it with the directory, and leaves the file in unmerged state, and sync doesn't yet change that. | ||
| * | Added a comment | http://joeyh.name/ | 2013-10-16 |
| | | |||
* | | sheesh | Joey Hess | 2013-10-16 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-10-16 |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-10-16 |
|\ | |||
* | | tighten file2key to not produce invalid keys with no keyName | Joey Hess | 2013-10-16 |
| | | | | | | | | | | | | A file named "foo-" or "foo-bar" was taken as a key's file, with a backend of "foo", and an empty keyName. This led to various problems, especially because converting that key back to a file did not yeild the same filename. | ||
| * | Added a comment: adding ssh server | https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo | 2013-10-16 |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-10-16 |
|\ | |||
* | | move another bug report out of forum | Joey Hess | 2013-10-16 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-10-16 |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-10-16 |
|\ | |||
* | | fix off-by-one | Joey Hess | 2013-10-16 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-10-16 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-10-16 |
|/ | |||
* | Added a comment | http://joeyh.name/ | 2013-10-16 |
| | |||
* | Added a comment | http://joeyh.name/ | 2013-10-16 |
| | |||
* | fix inclusion of -gitrev | Joey Hess | 2013-10-16 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-10-16 |
|\ |