mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17919 commits 13 branches 442 tags 103 MiB
Commit graph

17919 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
b4d6b79618 improved test for FAT symlink regressions 
The test case that was supposed to cover this did not.. It is for some
other bug, which is apparently a bit of a heisenbug.
 2014-03-04 13:36:42 -04:00
Joey Hess
38cd30752c fix environment propigation in windows test suite 
Let through HOME, etc when running git-annex from test suite.
 2014-03-04 03:01:31 -04:00
Joey Hess
1fbf5f608d Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-04 02:11:20 -04:00
Joey Hess
4a847cdc08 finish fixing direct mode merge bug involving unstaged local files 
Added test cases for both ways this can happen, with a conflict involving a
file, or a directory.

Cleaned up resolveMerge to not touch the work tree in direct mode, which
turned out to be the only way to handle things.. And makes it much nicer.

Still need to run test suite on windows.
 2014-03-04 02:03:15 -04:00
Joey Hess
19475fd0ab add test cases for the new direct mode merge bug 2014-03-04 01:41:00 -04:00
http://joeyh.name/
d6c69b8d66 Added a comment 2014-03-03 21:58:21 +00:00
Joey Hess
fb88e0f02c fix 1192d98721 to handle annexed files in conflicted merge 
In the case of a conflicted merge where the remote adds a directory, and we
have a file (which is checked in), resolveMerge' will create the link,
and so the fix for 1192d98721 looked at that,
thought it was an unannexed file (it's not in the oldref), and preserved
it.

This is a hacky fix. It would be better for resolveMerge' to not update the
work tree, at least in direct mode, and only stage the changes, which
mergeDirectCleanUp could then move into tree. I want to make that change,
but this is not the time to do it.
 2014-03-03 17:09:53 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
bf981aa1d0 2014-03-03 20:34:44 +00:00
Joey Hess
6dc8bfad0b rename for clarity 2014-03-03 16:33:21 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
28c97d3104 2014-03-03 20:27:58 +00:00
Joey Hess
d6696dbc98 simplfy 2014-03-03 16:21:36 -04:00
Joey Hess
eef1b7a3cc fixed initial reported problem but not out of the woods yet in some related cases 2014-03-03 15:00:54 -04:00
Joey Hess
36ab2cd0e0 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-03 14:57:32 -04:00
Joey Hess
1192d98721 sync: Fix bug in direct mode that caused a file not checked into git to be deleted when merging with a remote that added a file by the same name. (Thanks, jkt) 2014-03-03 14:57:16 -04:00
http://joeyh.name/
c8e4c76302 2014-03-03 18:12:11 +00:00
Joey Hess
04b77328ef
fix handling of nonexistant hook 2014-03-03 13:59:36 -04:00
Joey Hess
cf8788fb49
add link to darktable-git-annex 2014-03-03 13:33:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk
502743b801 Added a comment 2014-03-03 14:05:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk
db47b041f1 Added a comment 2014-03-03 14:01:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
c3be59735d Added a comment 2014-03-03 07:44:30 +00:00
Joey Hess
31062ab2bf
number list 2014-03-02 20:27:37 -04:00
Joey Hess
03dc6dcab8
decruft 2014-03-02 20:26:27 -04:00
Joey Hess
08b9bc7b7b devblog 2014-03-02 20:22:04 -04:00
Joey Hess
d0fce426c4 pre-commit-annex hook script to automatically extract metadata from lots of types of files 
Using the extract(1) program to do the heavy lifting.

Decided to make git-annex run pre-commit-annex when committing. Since
git-annex pre-commit also runs it, it'll be run when git commit is run too,
via the pre-commit hook. This basically gives back the pre-commit hook
that git-annex took away. The implementation avoids repeatedly looking
for the hook script when the assistant is running and committing
repeatedly; only checks if the hook is available once.

To make the script simpler, made git-annex metadata -s field?=value
only set a field when it's not already got a value.

This commit was sponsored by bak.
 2014-03-02 20:11:58 -04:00
Joey Hess
34059c09e2 update 2014-03-02 16:27:04 -04:00
Joey Hess
0ac8912f9c view: Refuse to enter a view when no branch is currently checked out. 2014-03-02 16:00:56 -04:00
Joey Hess
06e39e6a79 update 2014-03-02 15:53:31 -04:00
Joey Hess
67c8b312b1 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-02 15:47:48 -04:00
Joey Hess
4643a0120c doc improvements 2014-03-02 15:46:58 -04:00
Joey Hess
308d4b67f3 fix combining of FIlterValues 2014-03-02 15:44:14 -04:00
Joey Hess
7d9486a709 vadd: Allow listing multiple desired values for a field. 2014-03-02 15:36:45 -04:00
Joey Hess
c2e8c21ca6 view, vfilter: Add support for filtering tags and values out of a view, using !tag and field!=value. 
Note that negated globs are not supported. Would have complicated the code
to add them, without changing the data type serialization in a
non-backwards-compatable way.

This commit was sponsored by Denver Gingerich.
 2014-03-02 14:53:19 -04:00
https://id.koumbit.net/anarcat
b7b1d2d3ff Added a comment 2014-03-02 16:33:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawntVnR-Z5ghYInvsElbDeADPSuCsF18iTY
53a431ea3a Added a comment: XMPP something to do with it? 2014-03-02 13:48:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
233df8dc4a Added a comment: Didn't work 2014-03-01 22:40:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
e5fde8d47a Added a comment 2014-03-01 19:13:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
5378e8fcda Added a comment 2014-03-01 11:23:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
e4723688e2 2014-03-01 10:39:11 +00:00
gueux
238f1995c8 2014-03-01 10:06:16 +00:00
Joey Hess
2432ecbdcc simplify 2014-03-01 00:41:29 -04:00
Joey Hess
7d2fed5810 windows build script back to normal 2014-03-01 00:33:50 -04:00
Joey Hess
9046136dd6 retrying windows yesod-static 2014-03-01 00:32:08 -04:00
Joey Hess
6a355686ff annex.listen can be configured, instead of using --listen 2014-03-01 00:31:17 -04:00
Joey Hess
2fd72fc2fd Revert "force cabal rebuild on windows for warp-tls" 
This reverts commit 92ced6d0fd.
 2014-02-28 23:07:54 -04:00
Joey Hess
92ced6d0fd
force cabal rebuild on windows for warp-tls 2014-02-28 23:06:41 -04:00
Joey Hess
4e62cf60e4 devblog 2014-02-28 22:53:47 -04:00
Joey Hess
d41367cc08 remove buggy --listen=host:port support 2014-02-28 22:53:26 -04:00
Joey Hess
0bc8dabb54 docs for remote webapp, securely 2014-02-28 22:39:06 -04:00
Joey Hess
1de3d3b9c9
fix restart/shutdown when using https 2014-02-28 22:20:54 -04:00
Joey Hess
cdc5b4a385 depend on warp-tls.. at least for now 2014-02-28 21:37:33 -04:00