CI to automate build of cargo lockfiles on different Alpine releases for git-annex aports https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/git-annex
Find a file
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
Annex init: Fix a failure when used in a submodule on a crippled filesystem. 2019-10-21 11:41:15 -04:00
Assistant Merge branch 'master' into sameas 2019-10-11 15:56:00 -04:00
Backend storing objects in git-lfs is working 2019-08-02 13:56:55 -04:00
Build copy the content linked to 2019-10-17 12:41:02 -04:00
CmdLine add --sameas option, not yet used 2019-10-01 12:36:25 -04:00
Command add RemoteStateHandle 2019-10-14 13:51:42 -04:00
Config update uninit to handle all the v7 stuff 2019-10-08 14:34:00 -04:00
Database Fix build with persistent-2.10. 2019-10-17 11:58:31 -04:00
debian Removed support for git versions older than 2.1 2019-09-11 16:14:43 -04:00
doc bug report of testremote failure with AWS S3 2019-10-19 21:22:27 +00:00
Git work around windows having infected git's plumbing 2019-10-08 15:27:05 -04:00
Limit update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Logs make DropDead transition minimize remote.log for dead sameas remotes 2019-10-15 11:39:25 -04:00
Messages remove many old version ifdefs 2019-07-05 15:09:37 -04:00
P2P minor typos 2019-03-27 11:15:20 -04:00
Remote add RemoteStateHandle 2019-10-14 13:51:42 -04:00
RemoteDaemon update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
standalone git-annex-standalone.rpm: Fix the git-annex-shell symlink 2019-10-08 14:43:28 -04:00
static Revert "remove newlines from static js and css" 2014-06-13 02:20:39 -04:00
templates webapp: remove configurators for obsolste cloud storage services 2019-01-22 11:48:35 -04:00
Test use #if not #ifdef 2019-09-24 17:32:33 -04:00
Types add RemoteStateHandle 2019-10-14 13:51:42 -04:00
Upgrade Refuse to upgrade direct mode repositories when git is older than 2.22 2019-08-29 15:24:41 -04:00
Utility enable-tor: Use pkexec to run command as root when gksu and kdesu are not available. 2019-09-30 15:19:01 -04:00
.ghci avoid ghci warning on tabs 2019-01-21 12:35:44 -04:00
.gitattributes update changelog location 2016-08-22 23:54:11 -04:00
.gitignore Removed Esqueleto as a dependency. 2018-11-06 22:18:55 +00:00
.mailmap alias for Yaroslav @ yahoo to mailmap 2015-09-09 12:38:59 -04:00
Annex.hs Removed support for git versions older than 2.1 2019-09-11 16:14:43 -04:00
Assistant.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Backend.hs plumb MeterUpdate into getKey 2019-06-25 11:43:24 -04:00
bash-completion.bash bash completion fix 2018-11-12 13:23:05 -04:00
Benchmark.hs new improved benchmark command that can benchmark anything git-annex does 2019-01-04 13:46:36 -04:00
build.bat let build.bat also be run from cygwin terminal 2015-04-21 14:12:14 -04:00
BuildFlags.hs Drop support for building with aws older than 0.14. 2019-04-19 14:27:59 -04:00
BuildInfo.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CHANGELOG init: Fix a failure when used in a submodule on a crippled filesystem. 2019-10-21 11:41:15 -04:00
CmdLine.hs get rid of implicitMessages state 2019-06-12 14:01:41 -04:00
Command.hs remove most remnants of direct mode 2019-08-26 16:27:48 -04:00
Common.hs import Utility.FileSystemEncoding in Common 2019-01-03 11:37:02 -04:00
Config.hs set annex-config-uuid when RemoteConfig contains a sameas-uuid 2019-10-10 12:58:59 -04:00
COPYRIGHT add entry for special remote example scripts which are GPL-3+ 2019-09-27 11:14:48 -04:00
Creds.hs rename RemoteConfigKey to RemoteConfigField 2019-10-10 15:44:05 -04:00
Crypto.hs inherit other fields 2019-10-10 16:11:21 -04:00
ghci avoid tab warnings from ghc 8 2016-11-17 13:39:30 -04:00
git-annex.cabal releasing package git-annex version 7.20191017 2019-10-17 18:19:47 -04:00
git-annex.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
git-union-merge.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Git.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Jenkinsfile Revert "debugging strange old version of git-annex in windows installer bundle" 2017-10-26 11:32:04 -04:00
Key.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Limit.hs fix annex.largefiles largerthan/smallerthan bug 2019-09-30 17:15:08 -04:00
Logs.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Makefile deal with flakey hdiutil 2019-10-17 16:28:48 -04:00
Messages.hs Fix find --json to output json once more. 2019-07-05 09:58:37 -04:00
NEWS releasing package git-annex version 7.20190912 2019-09-13 12:53:40 -04:00
README use https 2014-11-06 14:20:10 -04:00
Remote.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Setup.hs Added git-remote-tor-annex, which allows git pull and push to the tor hidden service. 2016-11-21 17:27:38 -04:00
stack-lts-12.14.yaml add stack-lts-12.14.yaml 2019-07-09 11:31:43 -04:00
stack.yaml Build with silently-1.2.5.1 on Windows; the old one used "NUL" which is not supported with recent versions of ghc. 2019-08-07 17:42:16 -04:00
Test.hs v7 for all repositories 2019-08-30 14:09:14 -04:00
Types.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Upgrade.hs fix build 2019-09-01 16:44:07 -04:00

git-annex allows managing files with git, without checking the file
contents into git. While that may seem paradoxical, it is useful when
dealing with files larger than git can currently easily handle, whether due
to limitations in memory, checksumming time, or disk space.

For documentation, see doc/ or <https://git-annex.branchable.com/>