Joey Hess
9731514c75
update sync branch to the orig branch when in adjusted branch
2016-02-29 16:57:42 -04:00
Joey Hess
048d513233
make assistant aware of adjusted branches when merging
2016-02-29 15:57:47 -04:00
Joey Hess
c1d7a5b97c
push original branch when on adjusted branch
2016-02-29 15:29:56 -04:00
Joey Hess
7c20bf6e7a
make sync aware of adjusted branches
...
So, it will pull and push the original branch, not the adjusted one.
And, for merging, it will use updateAdjustedBranch (not implemented yet).
Note that remaining uses of Git.Branch.current need to be checked too;
for things that should act on the original branch, and not the adjusted
branch.
2016-02-29 15:23:08 -04:00
Joey Hess
9e1ebc2336
include adjustment in the adjusted branch name
...
Allows it to be recovered easily.
2016-02-29 15:04:58 -04:00
Joey Hess
3b4557c754
Merge branch 'master' into adjustedbranch
2016-02-29 14:05:10 -04:00
Joey Hess
e520366c4d
metadata: Added -r to remove all current values of a field.
2016-02-29 13:00:46 -04:00
Joey Hess
98fcc23e4f
use DelMeta to unset tag
...
No behavior change, just simplification.
2016-02-29 13:00:23 -04:00
Joey Hess
4763004632
add news item for git-annex 6.20160229
2016-02-29 12:56:56 -04:00
Joey Hess
c4494f1abe
leap year release
2016-02-29 12:41:59 -04:00
Joey Hess
5c23b8b49a
forgot to add this comment earlier
2016-02-29 12:41:39 -04:00
Joey Hess
37a89cca43
comment
2016-02-29 11:52:20 -04:00
Joey Hess
be4820ce32
Merge branch 'master' of ssh://git-annex.branchable.com
2016-02-29 11:43:29 -04:00
Joey Hess
955ab3a973
fix android build
2016-02-29 11:43:22 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
2d5039fff6
2016-02-29 06:22:05 +00:00
Joey Hess
36ba39c4f3
remove lower-casing of field names; metadata fields are case-insensative
2016-02-28 11:56:55 -04:00
Joey Hess
79a7bed2d7
Merge branch 'master' of ssh://git-annex.branchable.com
2016-02-28 11:11:43 -04:00
Joey Hess
764e57f1f1
The pre-commit-annex hook script that automatically extracts metadata has been updated to also use exiftool. Thanks, Klaus Ethgen.
2016-02-28 11:10:55 -04:00
page
e164d530f9
Added a comment: Some additional notes
2016-02-28 11:44:39 +00:00
Joey Hess
b946ca44c3
Support --metadata field<number, --metadata field>number etc to match ranges of numeric values.
...
Similarly (well, for free), support preferred content expressions like
metadata=field<number and metadata=field>number
2016-02-27 10:55:02 -04:00
Joey Hess
01f1de0c3c
close bug and changelog
...
finished testing recent commits, and I did solve it
2016-02-26 16:51:28 -04:00
Joey Hess
ac8af8da07
better forcing of hash
2016-02-26 16:36:24 -04:00
Joey Hess
facc50d965
forgot to use sfile
2016-02-26 16:12:40 -04:00
Joey Hess
e3a73e5bb7
try again at forcing file read while hashing
2016-02-26 14:04:10 -04:00
Joey Hess
41fd029c9b
update
2016-02-26 13:54:58 -04:00
Joey Hess
66f2b3d4e0
bug
2016-02-26 13:49:26 -04:00
Joey Hess
fe44eb95e2
close
2016-02-26 13:36:17 -04:00
Joey Hess
d1f87e8c8e
test revert "force hash to finish with file before returning"
...
This reverts commit 7482853ddd
2016-02-26 13:30:38 -04:00
Joey Hess
3a6039c287
typo
2016-02-26 12:21:20 -04:00
Joey Hess
471a211d21
Include magic database in the linux and OSX standalone builds.
2016-02-26 11:54:15 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
5d0b5eeefb
2016-02-26 04:04:40 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
5e5f8f1a74
2016-02-26 03:59:37 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
e815b5c23c
Added a comment
2016-02-26 03:56:42 +00:00
Joey Hess
448c1cc057
Merge branch 'master' of ssh://git-annex.branchable.com
2016-02-25 17:13:16 -04:00
Joey Hess
44f1672e37
devblog
2016-02-25 17:12:41 -04:00
Joey Hess
0a1b02ce04
adjusted branches, proof of concept
...
"git annex adjust" may be a temporary interface, but works for a proof of
concept.
It is pretty fast at creating the adjusted branch. The main overhead is
injecting pointer files. It might be worth optimising that by reusing the
symlink target as the pointer file content. When I tried to do that,
the problem was that the clean filter doesn't use that same format, and so
git thought files had changed. Could be dealt with, perhaps make the clean
filter use symlink format for pointer files when on an adjusted branch?
But the real overhead is in checking out the branch, when git runs the
smudge filter once per file. That is perhaps too slow to be usable,
although it may only affect initial checkout of the branch, and not
updates. TBD.
2016-02-25 16:23:24 -04:00
Joey Hess
4712882776
add hashPointerFile'
2016-02-25 16:10:54 -04:00
Joey Hess
04d4830ac3
add catCommit
2016-02-25 15:34:46 -04:00
Joey Hess
3b74dc8be8
add fromBlobType
2016-02-25 15:34:22 -04:00
Joey Hess
7b2496508f
factor out commitTree
2016-02-25 15:33:50 -04:00
Joey Hess
1f91d1d0b7
add catCommit, with commit object parser
2016-02-25 15:14:47 -04:00
Joey Hess
be2e9427ad
refactor
2016-02-25 13:46:31 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
229db26e83
Added a comment: would it be possible to get a branch only with annexed content?
2016-02-25 03:04:26 +00:00
tom_clune
288326f121
Added a comment: dropping files after changing branches/tags
2016-02-24 22:19:00 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
969755804a
2016-02-24 21:42:28 +00:00
tom_clune
c6d0e3e62e
Added a comment: git annex using the "wrong" ssh socket
2016-02-24 19:23:13 +00:00
matyasbot@fd008517d046c382e18306c0b3db48eb58d45dee
a11aaf4f99
2016-02-24 19:14:42 +00:00
https://me.yahoo.com/a/ZF7p46cPmpWtb9zvA8iTitPmiQ--#eb014
8c97f9e40f
2016-02-24 03:55:44 +00:00
Joey Hess
804aeca5d2
parse strictly
...
This reduces memory use, because it avoids thunks that buffer parts of the
ls-tree output that are not needed.
2016-02-23 23:08:41 -04:00
Joey Hess
e5dd91b189
better encapsulation
2016-02-23 22:22:22 -04:00
