Commit graph

35598 commits

Author SHA1 Message Date
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
Joey Hess
0bff3c1070
comments 2019-10-22 00:14:03 -04:00
Ilya_Shlyakhter
e2ba1e09cf Added a comment: check the 'git add' changes before upgrading 2019-10-22 00:27:51 +00:00
ghen1
916fd04d1a 2019-10-21 21:44:33 +00:00
Ilya_Shlyakhter
9a46f17e2c Added a comment: skipping dotfiles 2019-10-21 20:39:09 +00:00
Ilya_Shlyakhter
b8fb0d5cb9 Added a comment: different annex.largefiles setting for git add than for git-annex add 2019-10-21 20:29:07 +00:00
Joey Hess
665646322b
comment 2019-10-21 16:01:26 -04:00
Joey Hess
f9464bd4be
Merge branch 'master' of ssh://git-annex.branchable.com 2019-10-21 15:24:19 -04:00
Joey Hess
913ac80d33
close a bug report redundant with an existing todo
copied over the dandi tag

updated the todo, as now that sameas is done it's unblocked
2019-10-21 15:23:04 -04:00
Joey Hess
76c050de92
comment 2019-10-21 15:05:23 -04:00
Joey Hess
b2880f045b
comment 2019-10-21 14:50:04 -04:00
nordmagnus999
be9453cf8a Added a comment: Tor and the UUID folder 2019-10-21 18:43:36 +00:00
Joey Hess
869933877a
comment 2019-10-21 13:53:07 -04:00
Joey Hess
3d4aab38ce
remove obsolete comment 2019-10-21 13:51:38 -04:00
Joey Hess
668b878995
remove recently added and unncessary cwd parameter
I later made Utility.Su change back to the cwd, so this parameter is not
needed.
2019-10-21 13:48:52 -04:00
Joey Hess
b94f2c18e1
response 2019-10-21 13:13:21 -04:00
Joey Hess
a632a16f14
comment 2019-10-21 12:53:04 -04:00
Joey Hess
8b1243228a
Merge branch 'master' of ssh://git-annex.branchable.com 2019-10-21 12:50:18 -04:00
Joey Hess
2edd04b292
comment 2019-10-21 12:48:34 -04:00
Joey Hess
9a5d9019ba
Deal with pkexec changing to root's home directory when running a command.
Wow, that's not documented anywhere, and seems like a major gotcha in
pkexec.

Broke enable-tor.
2019-10-21 12:39:19 -04:00
Lukey
c452f01843 Added a comment 2019-10-21 16:27:50 +00:00
Joey Hess
93f53cda08
Merge branch 'master' of ssh://git-annex.branchable.com 2019-10-21 11:41:31 -04:00
Joey Hess
5db79339a1
init: Fix a failure when used in a submodule on a crippled filesystem.
When the submodule's parent repo has an adjusted unlocked branch,
it gets cloned by git, but git checks out master. git annex init then
fails because it wants to enter the adjusted branch, but:

  adjusted branch adjusted/master(unlocked) already exists.

  Aborting because that branch may have changes that have not yet reached master

Note that init actually then exits 0, leaving master checked out.

This could also happen, absent submodules, if the parent repo has
an adjusted unlocked branch, but it is not checked out. In the more common
case where that branch is checked out, the clone uses the same branch,
so no problem.

The choices to fix this:

* Init could delete the existing adjusted branch, and re-adjust.
  But then running init inside an adjusted branch on a crippled filesystem
  would lose any changes that have not been synced back to master.
* Init could sync any changes back to master, but that would be very surprising
  behavior for it.
* Init could simply check out the existing adjusted branch. If the branch
  is diverged from master, well, sync will sort that out later.
  This mirrors the behavior of cloning a repo that has an adjusted branch
  checked out that has not yet been synced back to master.
  Picked this choice.
2019-10-21 11:41:15 -04:00
anarcat
a2bc387c6b i always have trouble finding this 2019-10-21 15:40:56 +00:00
nordmagnus999
219a584490 2019-10-21 10:48:36 +00:00
nordmagnus999
f09784f851 2019-10-21 10:43:16 +00:00
nordmagnus999
7ed2631d5b 2019-10-21 10:42:15 +00:00
nordmagnus999
82b34a3364 2019-10-21 09:01:53 +00:00
nordmagnus999
1f8e6bf2de 2019-10-21 08:58:10 +00:00
Ilya_Shlyakhter
2e53c679cc Added a comment: different handling of dotfiles 2019-10-21 02:51:16 +00:00
Ilya_Shlyakhter
7c788c1f95 added bug report about unexpectedly ignoring dotfiles 2019-10-21 02:43:48 +00:00
Ilya_Shlyakhter
43127e7ad4 Added a comment 2019-10-21 02:02:47 +00:00
Ilya_Shlyakhter
a9dbcd96ae Added a comment 2019-10-21 02:02:31 +00:00
Ilya_Shlyakhter
ba30c816dc removed 2019-10-21 02:00:28 +00:00
Ilya_Shlyakhter
951ef83818 Added a comment 2019-10-21 01:59:34 +00:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
93773b5788 Added a comment: a case for request routing 2019-10-20 19:42:04 +00:00