Commit graph

3714 commits

Author SHA1 Message Date
Joey Hess
8bf2d1902b format 2012-05-26 23:47:55 -04:00
Joey Hess
697298718c update 2012-05-26 22:25:25 -04:00
Joey Hess
76720a6d0d update 2012-05-26 21:38:25 -04:00
Joey Hess
6703892e83 reord 2012-05-26 21:24:43 -04:00
Joey Hess
ec9f793db1 update 2012-05-26 21:18:27 -04:00
Joey Hess
08aeec8f1e alternative 2012-05-26 21:17:21 -04:00
Joey Hess
147f63ccab tweak 2012-05-26 21:15:40 -04:00
Joey Hess
573f1c03a8 fix 2012-05-26 21:15:07 -04:00
Joey Hess
931b85c481 update 2012-05-26 21:14:27 -04:00
Joey Hess
45a01db6ad add preliminary design 2012-05-26 21:11:19 -04:00
Joey Hess
f7524811e2 bug 2012-05-25 08:52:55 -04:00
http://joeyh.name/
570fe8af6f Added a comment 2012-05-24 20:15:19 +00:00
Joey Hess
b8f12b0dbe fix inline pagenames in walkthrough
I should read my own ikiwiki changelog when upgrading, apparently.
2012-05-24 16:10:21 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
164b55e992 Added a comment 2012-05-24 19:18:55 +00:00
https://rmunn.myopenid.com/
3d208ee569 2012-05-24 18:14:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
c270ca5453 fix typo 2012-05-24 07:52:54 +00:00
https://launchpad.net/~ojwb
09fbc215e8 typo fixes 2012-05-24 05:07:07 +00:00
Joey Hess
66580a8b7a fix link 2012-05-23 19:37:22 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk5cj-itfFHq_yhJHdzk3QOPp-PNW_MjPU
1b1703c84c Added a comment: +1 Cygwin 2012-05-23 19:30:22 +00:00
Joey Hess
d0da2ce5ea add news item for git-annex 3.20120522 2012-05-22 11:28:09 -04:00
Joey Hess
ab07762ddb releasing version 3.20120522 2012-05-22 11:27:22 -04:00
Joey Hess
37ef39c929 suppress "(Recording state in git)" message when committing change to remote state
This was shown redundantly for a tricky reason -- while it runs
inside a doSideAction block that would appear to supress it,
the action being run is in a different state monad; for the remote,
and so the suppression doesn't work.

Always suppressing the message when committing to a local remote is
ok do to though -- it mirrors the /dev/nulling of the git annex shell commit
output. And it turns out that any time there is a git-annex branch state
change to commit on the remote, the local repo has also had a similar
change made, and so the message has been shown already.
2012-05-20 00:14:56 -04:00
Joey Hess
ebbd24e5ed more worktree improvements
Avoid more expensive code path when no core.worktree is configured.

Don't change worktree when reading config if one is already set.
This could happen if GIT_CORE_WORKTREE is set, and the repo also has
core.worktree, and the config is reread. Now GIT_CORE_WORKTREE will
prevail.
2012-05-19 11:08:50 -04:00
Joey Hess
9d98144776 avoid chdir when already inside worktree 2012-05-19 10:37:28 -04:00
Joey Hess
0093a456e8 test suite saved my bacon
git config reading memoization shouldn't be used when changing config
2012-05-19 10:22:43 -04:00
Joey Hess
a1885bd116 make GIT_DIR, GIT_WORK_TREE absolute
GIT_DIR is set to something relative, like ".git" in the pre-commit hook.
But internally all the directories are assumed to be absolute.
2012-05-18 18:32:19 -04:00
Joey Hess
eb6cb1b87f Add support for core.worktree, and fix support for GIT_WORK_TREE and GIT_DIR.
The environment needs to override git-config. Changed when git config is
read, and avoid rereading it once it's been read.

chdir for both worktree settings.
2012-05-18 18:20:53 -04:00
Joey Hess
bb4f31a0ee Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.

This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.

A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.

Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)

Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.

One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
2012-05-18 17:03:12 -04:00
Joey Hess
a2be4265bf add 2012-05-16 15:19:39 -04:00
Joey Hess
f4b96ee44e Merge branch 'master' of ssh://git-annex.branchable.com 2012-05-15 14:20:48 -04:00
Joey Hess
e36808e167 Pass -a to cp even when it supports --reflink=auto, to preserve permissions.
Amoung other things, this makes unlocking a WORM backed file and then
re-adding it without making any changes not add a new object, as the
timestamp is preserved.
2012-05-15 14:18:51 -04:00
http://joeyh.name/
a25237d205 Added a comment 2012-05-15 17:00:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
300d3cbdef Added a comment 2012-05-15 07:59:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
1e590dcc47 Added a comment 2012-05-15 07:36:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ
461367f23b 2012-05-15 02:42:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkRITTYYsN0TFKN7G5sZ6BWGZOTQ88Pz4s
b261d09637 Added a comment: cygwin 2012-05-15 00:14:10 +00:00
Joey Hess
2701800cda cleanup 2012-05-11 12:38:56 -04:00
Joey Hess
1c942c898d add news item for git-annex 3.20120511 2012-05-11 12:38:08 -04:00
Joey Hess
61a5df33d4 releasing version 3.20120511 2012-05-11 12:37:26 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ
f02db7bfce Added a comment 2012-05-10 19:21:08 +00:00
http://joeyh.name/
891684f85d Added a comment 2012-05-10 19:17:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ
8734e7cba5 Added a comment: Git annex content transfer protocols 2012-05-10 19:13:48 +00:00
http://joeyh.name/
daaeba3afb Added a comment 2012-05-10 18:51:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ
660f5de551 Added a comment: Protocols to transfer file content 2012-05-10 18:48:41 +00:00
Joey Hess
7943318ec6 Merge branch 'master' of ssh://git-annex.branchable.com 2012-05-10 14:26:55 -04:00
Joey Hess
32a41f8af1 add a favicon 2012-05-10 14:18:35 -04:00
http://joeyh.name/
ab84b612ea Added a comment: rsync over ssh 2012-05-10 18:18:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ
ef247f3da7 2012-05-10 13:14:50 +00:00
http://joeyh.name/
ac08c37649 Added a comment 2012-05-08 18:22:12 +00:00
https://me.yahoo.com/a/IAg3idYGk.joxsJb2WCxl20gig.0.8hS#d5165
3770bc5d41 2012-05-07 21:57:58 +00:00