Commit graph

35633 commits

Author SHA1 Message Date
Joey Hess
59b8294b2b
prep release 2019-10-24 14:40:36 -04:00
Joey Hess
4a3f3a2cb5
make git add only annex when configured by annex.largefiles 2019-10-24 14:17:29 -04:00
Joey Hess
31a5b58b2c
documentation for making git add only annex when configured by annex.largefiles
Code change should be trvial, but not yet implemented. This
significantly complicated the task of documenting how git-annex works.

I'm not sure how useful the annex.gitaddtoannex confguration is after
this change; seems that if a user has an annex.largefiles they will want
it applied consistently. But the last thing I want to hear is more
complaining from users about git add doing something they don't want it
to.

There's a pretty high risk users who got used to the git add behavior
and don't have annex.largefiles configured will miss the NEWS and
complain bitterly about their suddenly bloated repositories. Oh well.

Removed outdated comments about the old behavior to avoid confusion.
I don't know if I've found all the places that griping spread to.
2019-10-24 14:01:54 -04:00
Joey Hess
64d4a35523
Merge branch 'master' of ssh://git-annex.branchable.com 2019-10-24 11:57:43 -04:00
Joey Hess
0f7fd008d4
fix sql syntax 2019-10-24 11:57:17 -04:00
Joey Hess
098afe144e
display sqlite error message when it crashes 2019-10-24 11:50:55 -04:00
Joey Hess
168f91efec
avoid warning over name 2019-10-24 11:46:40 -04:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
ccdb34b181 Added a comment: Friendly bump to keep on the radar 2019-10-24 09:26:23 +00:00
ghen1
6dd732f1e6 Added a comment 2019-10-23 21:03:11 +00:00
anarcat
b4a9397c4a Added a comment: right! forgot about log -S 2019-10-23 20:16:26 +00:00
anarcat
2755a22c37 update from comments 2019-10-23 20:15:40 +00:00
Joey Hess
94a7bd9873
clarify 2019-10-23 15:43:31 -04:00
Joey Hess
f1b374e44e
devblog 2019-10-23 15:33:30 -04:00
Joey Hess
8fb1350a2c
Merge branch 'master' of ssh://git-annex.branchable.com 2019-10-23 15:30:55 -04:00
Joey Hess
bd197be3ad
annex.gitaddtoannex configuration
Added annex.gitaddtoannex configuration. Setting it to false prevents
git add from usually adding files to the annex.
(Unless the file was annexed before, or a renamed annexed file is detected.)

Currently left at true; some users are encouraging it be set to false.
2019-10-23 15:29:46 -04:00
Joey Hess
ec08b66bda
shouldAnnex: check isInodeKnown
Renamed unlocked files are now detected, and will always be
annexed, unless annex.largefiles disallows it.

This allows for git add's behavior to later be changed to otherwise
not annex files (whether by default or as a config option), without
worrying about the rename case.

This is not a major behavior change; annexing is still the default. But
there is one case where the behavior is changed, I think for the better:

	touch f
	git -c annex.largefiles=nothing add f
	git add bigfile
	git commit -m ...
	mv bigfile f
	git add f

Before, git-annex would see that f was previously not annexed,
and so the renamed bigfile content gets added to git. Now, it notices
that the inode is the one that bigfile used, and so it annexes it.

This potentially slows down git add a lot in some repositories because
of the poor performance of isInodeKnown when there are a lot of unlocked
files. Configuring annex.largefiles avoids the speed hit.
2019-10-23 14:49:45 -04:00
Joey Hess
94efc400e9
horrible impementation of isInodeKnown
The only good thing about it is it does not require a major version bump
to improve the database. That will need to happen at some point though.

Potentially very very slow in a large repository.

Ugly use of raw sql.
2019-10-23 14:37:29 -04:00
Ilya_Shlyakhter
2d33c62965 Added a comment: configuring git add behavior 2019-10-23 17:57:03 +00:00
Ilya_Shlyakhter
bdf6d2eb48 Added a comment: preventing git add from annexing new files 2019-10-23 17:05:42 +00:00
Joey Hess
eebf080b33
comment typo 2019-10-23 12:32:46 -04:00
Ilya_Shlyakhter
5f7036d0a7 Added a comment: searching by inode 2019-10-23 16:32:37 +00:00
Joey Hess
ff5c0ef43f
comment 2019-10-23 12:26:55 -04:00
Joey Hess
f318743f77
rename this so it does not start with a dash 2019-10-23 12:16:12 -04:00
Joey Hess
e98f230c95
remove unused function 2019-10-23 12:01:34 -04:00
Joey Hess
b23c87cd0f
fix formatting of inserted news 2019-10-23 12:01:09 -04:00
Joey Hess
940be8cd70
Merge branch 'master' of ssh://git-annex.branchable.com 2019-10-23 11:53:32 -04:00
Joey Hess
bbdeb1a1a8
sync: Fix crash when there are submodules and an adjusted branch is checked out
Reverse adjusting the branch uses treeItemToTreeContent, which was missed
when adding submodule support earlier.
2019-10-23 11:52:56 -04:00
spwhitton
f67285f079 Added a comment 2019-10-23 15:28:56 +00:00
spwhitton
2744c1d7a0 Added a comment 2019-10-23 15:25:30 +00:00
amindfv@6f75355c5dad3450ed73d1f01715be90dfdd6cd6
f6222bc6c4 Added a comment 2019-10-23 04:42:36 +00:00
amindfv@6f75355c5dad3450ed73d1f01715be90dfdd6cd6
3aec7db42e Added a comment 2019-10-23 04:24:01 +00:00
Ilya_Shlyakhter
bafed0f619 Added a comment: can git add only annex already-annexed files? 2019-10-22 20:01:52 +00:00
Joey Hess
70b306ec34
start at analysis before dental appt 2019-10-22 15:46:34 -04:00
Joey Hess
13d86a9c88
reproduced 2019-10-22 15:33:00 -04:00
Joey Hess
7b1f1785aa
no, sorry, you don't get to conflate issues 2019-10-22 15:19:10 -04:00
Joey Hess
3f89b6bd3f
Merge branch 'master' of ssh://git-annex.branchable.com 2019-10-22 15:16:20 -04:00
Joey Hess
c4374e4aee
followup 2019-10-22 14:36:31 -04:00
Ilya_Shlyakhter
48999a3caf Added a comment: locking files before reverting to v5 2019-10-22 18:25:11 +00:00
Joey Hess
5581dc3318
comment 2019-10-22 13:30:04 -04:00
Joey Hess
df963469f2
comment 2019-10-22 13:12:57 -04:00
Joey Hess
abb5b675f1
comment 2019-10-22 13:10:28 -04:00
Ilya_Shlyakhter
cf2d18a568 Added a comment: temporary manual downgrade of repos to v5 is possible 2019-10-22 16:40:32 +00:00
Ilya_Shlyakhter
00b1beb41b removed 2019-10-22 16:35:15 +00:00
Ilya_Shlyakhter
74ee238671 Added a comment: temporary manual downgrade of repos to v5 is possible 2019-10-22 16:33:22 +00:00
CandyAngel
ebb893a177 Added a comment 2019-10-22 08:18:31 +00:00
leej
4175d50d4b Added a comment: +1 to the comments above 2019-10-22 07:21:31 +00:00
irieger
ffbf205ab6 removed 2019-10-22 06:55:20 +00:00
irieger
4865102572 Added a comment: comment 3 2019-10-22 06:54:44 +00:00
irieger
d57751f51c Added a comment: comment 3 2019-10-22 06:23:21 +00:00
Joey Hess
cf40f4df3e
comment 2019-10-22 00:38:33 -04:00