Commit graph

8357 commits

Author SHA1 Message Date
petr.marketlab@4024e478aebbe860ab1cbf03aca8adb30127c56e
2acca8a3ae 2018-08-28 15:26:07 +00:00
petr.marketlab@4024e478aebbe860ab1cbf03aca8adb30127c56e
1885cca783 2018-08-28 15:18:27 +00:00
Joey Hess
10138056dc
v6: avoid accidental conversion when annex.largefiles is not configured
v6: When annex.largefiles is not configured for a file, running git add or
git commit, or otherwise using git to stage a file will add it to the annex
if the file was in the annex before, and to git otherwise. This is to avoid
accidental conversion.

Note that git-annex add's behavior has not changed, for reasons explained
in the added comment.

Performance: No added overhead when annex.largefiles is configured.
When not configured, there is an added call to catObjectMetaData,
which involves a round trip through git cat-file --batch.
However, the earlier catKeyFile primes the cache for it.

This commit was supported by the NSF-funded DataLad project.
2018-08-27 14:51:10 -04:00
Joey Hess
b3dfcd18fe
followup 2018-08-27 13:36:11 -04:00
Joey Hess
8478544b58
analysis, plan
This commit was supported by the NSF-funded DataLad project.
2018-08-27 13:14:34 -04:00
Joey Hess
d7f386a81d
reproduced with current 2018-08-27 12:20:58 -04:00
Joey Hess
d5980b7139
close, this was fixed last week 2018-08-27 12:15:43 -04:00
duncan_bayne
5a90234f47 2018-08-26 02:37:25 +00:00
rajagopal.abhejit@a18fbb434d26431ed70e7fad7bd6a696df2b7d85
65bd018f94 removed 2018-08-22 01:13:45 +00:00
rajagopal.abhejit@a18fbb434d26431ed70e7fad7bd6a696df2b7d85
529b84c5ca removed 2018-08-22 01:11:08 +00:00
rajagopal.abhejit@a18fbb434d26431ed70e7fad7bd6a696df2b7d85
7d0b838153 Added a comment 2018-08-22 01:10:54 +00:00
rajagopal.abhejit@a18fbb434d26431ed70e7fad7bd6a696df2b7d85
0b8759771a Added a comment 2018-08-22 01:10:40 +00:00
yarikoptic
78ecd6b17a Added a comment 2018-08-21 16:23:05 +00:00
yarikoptic
dae76d8ef3 fixup the trailer 2018-08-21 16:02:25 +00:00
Joey Hess
056b081280
followup 2018-08-21 11:56:51 -04:00
yarikoptic
e009c0efed original filing about web remote listing 2018-08-21 15:09:10 +00:00
Joey Hess
9091d52a1f
close old openbsd build bugs 2018-08-17 16:18:40 -04:00
Joey Hess
2e153de34a
close 2018-08-16 16:41:08 -04:00
duncan_bayne
7e9d6c4ef1 Added a comment: RTFM 2018-08-16 04:25:27 +00:00
Joey Hess
f1dfed4d5a
response 2018-08-13 12:44:34 -04:00
webanck
cd62ab20a3 Added a comment: Similar issue again 2018-08-13 14:18:17 +00:00
webanck
55d7660576 removed 2018-08-13 14:16:09 +00:00
webanck
3829f2de16 Added a comment: Similar issue again 2018-08-13 14:11:48 +00:00
duncan_bayne
6ce59ccfe5 2018-08-12 06:19:36 +00:00
duncan_bayne
b5910dac68 2018-08-12 06:18:36 +00:00
duncan_bayne
874dd3febf 2018-08-12 06:17:56 +00:00
yarikoptic
b47fef55f0 Added a comment: my 1c 2018-08-10 19:17:17 +00:00
Joey Hess
74551a430a
soften 2018-08-09 16:03:43 -04:00
Joey Hess
6de8bbaad9
followup 2018-08-09 16:01:48 -04:00
Joey Hess
1f8e6d7e3a
hm 2018-08-09 15:44:01 -04:00
Joey Hess
0e04d9cfab
Merge branch 'master' of ssh://git-annex.branchable.com 2018-08-09 15:07:17 -04:00
Joey Hess
7b9762b6af
document converting from git to annex and back 2018-08-09 15:06:51 -04:00
yarikoptic
a18b9cb8be Added a comment: may be one more gitattribute to instruct on either conversion is desired for the file? 2018-08-09 18:59:56 +00:00
Joey Hess
adcca7ecd7
one more thought 2018-08-09 13:14:52 -04:00
Joey Hess
5b56ca32c6
typo 2018-08-09 13:10:31 -04:00
Joey Hess
42fcf59921
rethink and Q 2018-08-09 13:06:25 -04:00
Joey Hess
78ade9e6cf
a plan 2018-08-09 12:38:00 -04:00
Joey Hess
6eeeb2eea8
same root cause for this too 2018-08-09 12:15:38 -04:00
Joey Hess
29a52e1518
understand now 2018-08-09 12:08:30 -04:00
Joey Hess
7ed987f6ca
and 2018-08-09 12:05:51 -04:00
Joey Hess
fc2ffb414f
followup 2018-08-09 12:04:07 -04:00
yarikoptic
2a7484bdc6 initial report about failure to commit 2018-08-08 20:07:27 +00:00
Joey Hess
12460fcea6
make --batch honor matching options
When --batch is used with matching options like --in, --metadata, etc, only
operate on the provided files when they match those options. Otherwise, a
blank line is output in the batch protocol.

Affected commands: find, add, whereis, drop, copy, move, get

In the case of find, the documentation for --batch already said it honored
the matching options. The docs for the rest didn't, but it makes sense to
have them honor them. While this is a behavior change, why specify the
matching options with --batch if you didn't want them to apply?

Note that the batch output for all of the affected commands could
already output a blank line in other cases, so batch users should
already be prepared to deal with it.

git-annex metadata didn't seem worth making support the matching options,
since all it does is output metadata or set metadata, the use cases for
using it in combination with the martching options seem small. Made it
refuse to run when they're combined, leaving open the possibility for later
support if a use case develops.

This commit was sponsored by Brett Eisenberg on Patreon.
2018-08-08 12:07:06 -04:00
Joey Hess
54eb80e945
Merge branch 'master' of ssh://git-annex.branchable.com 2018-08-08 11:06:08 -04:00
Joey Hess
ec18b84bdb
moreinfo this 2018-08-08 11:05:05 -04:00
Joey Hess
0fd093485d
close 2018-08-08 11:03:43 -04:00
CandyAngel
56bce6a5cc 2018-08-07 23:18:09 +00:00
https://openid-provider.appspot.com/iakornfeld
48d11a5dfb Added a comment: Sorry 2018-08-07 14:12:20 +00:00
https://openid-provider.appspot.com/iakornfeld
797c3e14c4 removed 2018-08-07 14:08:12 +00:00
https://openid-provider.appspot.com/iakornfeld
0f70ee06db Added a comment: Yes 2018-08-07 14:07:56 +00:00