Commit graph

34586 commits

Author SHA1 Message Date
Ilya_Shlyakhter
4d0ae18635 Added a comment 2019-05-06 22:38:43 +00:00
Joey Hess
ecdbdf6180
add --verify
Needed for the --quiet to actually shut it up. The extra verification
this makes it do should be fine, as this is supposed to really return a
single tree's sha.
2019-05-06 16:41:01 -04:00
Joey Hess
e29f07258a
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-06 16:30:47 -04:00
Joey Hess
d08c19defb
avoid git warning on first import of subdir from a remote
git rev-parse --quiet avoids "fatal: Invalid object name" when the
branch does not exist. Git.Ref.tree already returned a Maybe, so callers
already handle those cases themselves.
2019-05-06 16:29:34 -04:00
Ilya_Shlyakhter
54b0028b5b Added a comment 2019-05-06 20:24:14 +00:00
Joey Hess
b03e65d260
Improved locking when multiple git-annex processes are writing to the .git/index file 2019-05-06 15:15:12 -04:00
Joey Hess
4bc99e4c21
add todo 2019-05-06 14:58:59 -04:00
Joey Hess
65a82e0d27
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-06 14:45:02 -04:00
Joey Hess
c31d0fe11b
re worktrees 2019-05-06 14:42:51 -04:00
Ilya_Shlyakhter
f0f0d6e61c Added a comment 2019-05-06 18:39:07 +00:00
Joey Hess
c5e0f9b3a5
fix setting imported tree
bf7ecd6892 went too far and broke
importing, the old tree was used on the remote tracking branch and not
the newly imported tree.

Test suite noticed the problem luckily.
2019-05-06 14:38:02 -04:00
Joey Hess
6c7bbe2c5a
test case for bf7ecd6892 2019-05-06 14:24:42 -04:00
Joey Hess
4f11885c12
response 2019-05-06 14:01:56 -04:00
Joey Hess
4999e6dd25
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-06 13:57:39 -04:00
Joey Hess
bf7ecd6892
fix export subtree reversion
Fix reversion in last release that caused wrong tree to be written to
remote tracking branch after an export of a subtree.

The invariant "commitsha should have the treesha as its tree"
was not met due to a bug. Guarantee it's met by catting the commitsha
to find its actual tree. A little bit slower, but this is not run often.
2019-05-06 13:57:13 -04:00
Ilya_Shlyakhter
590acf2b0d question about concurrent writing to the git-annex branch by multiple git-annex commands 2019-05-06 17:05:50 +00:00
Joey Hess
0533fde73c
reproduced 2019-05-06 12:43:26 -04:00
Joey Hess
1bae209470
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-06 12:42:49 -04:00
Joey Hess
c6a4779036
analysis 2019-05-06 12:39:35 -04:00
Joey Hess
6ad51d5627
comment 2019-05-06 12:29:53 -04:00
Joey Hess
7c874327aa
comment 2019-05-06 12:25:17 -04:00
Joey Hess
6845c1e020
comment 2019-05-06 12:16:19 -04:00
Joey Hess
7c6ada691b
comment 2019-05-06 12:07:08 -04:00
Joey Hess
b3eed0feac
comment 2019-05-06 12:04:25 -04:00
Joey Hess
1a0c3e864b
close 2019-05-06 12:02:10 -04:00
Joey Hess
bcbaf3a851
update 2019-05-06 10:51:54 -04:00
herbgroll@5a05f17cf9cd3d69057fee2991f630e5a60cd197
947503cc6d 2019-05-05 19:15:28 +00:00
Joey Hess
afd57e137b
tweak to fix man page indent 2019-05-04 11:45:55 -04:00
Joey Hess
fd57780d04
add news item for git-annex 7.20190503 2019-05-03 12:49:01 -04:00
Joey Hess
4da50456a3
releasing package git-annex version 7.20190503 2019-05-03 12:48:28 -04:00
Ilya_Shlyakhter
437fa438e3 Added a comment 2019-05-03 16:31:18 +00:00
Ilya_Shlyakhter
6535d0c1b2 Added a comment 2019-05-03 16:26:40 +00:00
Ilya_Shlyakhter
03a20b225a Added a comment 2019-05-03 16:11:06 +00:00
Joey Hess
9cb795da5f
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-03 11:53:37 -04:00
Joey Hess
40c749387f
comment 2019-05-03 11:53:03 -04:00
Ilya_Shlyakhter
3d214c3499 Added a comment 2019-05-03 15:50:43 +00:00
Joey Hess
644bae6f66
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-03 11:38:22 -04:00
Joey Hess
8c4b1d6f1f
response; cleanup 2019-05-03 11:37:41 -04:00
Ilya_Shlyakhter
64bcaff016 added todo for speculate-can-get : extension of speculate-present 2019-05-03 15:34:41 +00:00
Joey Hess
e7ec6f548e
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-03 11:30:54 -04:00
Joey Hess
96dfba7b53
fix build w/o MagicMime more 2019-05-03 11:30:20 -04:00
yarikoptic
627fe280b0 Added a comment: question about .gitattributes 2019-05-03 15:21:41 +00:00
Joey Hess
740c9f7da8
fix build w/o MagicMime 2019-05-03 11:20:25 -04:00
Joey Hess
60bed2c186
remove 2019-05-03 11:06:35 -04:00
Joey Hess
00e9e15c70
squelch build warning with old version of quickcheck 2019-05-03 11:02:12 -04:00
Joey Hess
2e1671076d
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-03 10:59:32 -04:00
Joey Hess
ab36f2f535
fix windows build 2019-05-03 10:58:34 -04:00
Ilya_Shlyakhter
a153a694f4 Added a comment 2019-05-02 16:04:06 +00:00
yarikoptic
3eeb5a732c initial report 2019-05-01 22:03:53 +00:00
Joey Hess
ec697721e4
simplify
and a bit faster using Eq this way
2019-05-01 15:34:07 -04:00