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 a569f195b7
fix bugs in handing of deep branches with sync and adjusted branches
* sync: Previously, when run in a branch with a slash in its name,
  such as "foo/bar", the sync branch was "synced/bar". That conflicted
  with the sync branch used for branch "bar", so has been changed to
  "synced/foo/bar".
* adjust: Previously, when adjusting a branch with a slash in its name,
  such as "foo/bar", the adjusted branch was "adjusted/bar(unlocked)".
  That conflicted with the adjusted branch used for branch "bar",
  so has been changed to "adjusted/foo/bar(unlocked)"
* Also, running sync in an adjusted branch did not correctly sync
  changes back to the parent branch when it had a slash in its name.
  This bug has been fixed.

Eliminate use of Git.Ref.under and Git.Ref.basename; using
Git.Ref.underBase and Git.Ref.base make everything handle deep branches
correctly.

Probably noone was adjusting deep branches, and v6 is still experimental
anyway, so I'm not going to worry about the mess that was left by that bug.

In the case of git-annex sync, using a fixed git-annex with an old unfixed
one will mean they use different sync branches for a deep branch, and so
they may stop syncing until the old one is upgraded. However, that's only
a problem when syncing between repositories without going via a central
bare repository. Added a warning about this to the CHANGELOG, but it's
probably not going to affect many people at all.

This commit was sponsored by Riku Voipio.
2016-09-21 15:23:47 -04:00
Annex fix bugs in handing of deep branches with sync and adjusted branches 2016-09-21 15:23:47 -04:00
Assistant remove redundant constraint 2016-09-15 00:04:56 -04:00
Backend Improve SHA*E extension extraction code. 2016-05-27 13:14:51 -04:00
Build Android: Fix disabling use of cp --reflink=auto, curl, sha224, and sha384. 2016-09-05 14:11:35 -04:00
CmdLine addurl, get: Added --json-progress option, which adds progress objects to the json output. 2016-09-09 15:06:54 -04:00
Command fix bugs in handing of deep branches with sync and adjusted branches 2016-09-21 15:23:47 -04:00
Config webapp: Fix bugs that could result in a relative path such as "." being written to ~/.config/git-annex/autostart 2015-12-02 15:57:30 -04:00
Database slightly more efficient checking of versionUsesKeysDatabase 2016-07-19 14:02:49 -04:00
debian Removed dependency on json library; all JSON is now handled by aeson. 2016-07-26 19:15:34 -04:00
doc fix bugs in handing of deep branches with sync and adjusted branches 2016-09-21 15:23:47 -04:00
Git fix bugs in handing of deep branches with sync and adjusted branches 2016-09-21 15:23:47 -04:00
Limit matchexpression: New plumbing command to check if a preferred content expression matches some data. 2016-01-25 16:16:18 -04:00
Logs move Arbitrary instance to new Types.Transfer module 2016-09-05 14:52:06 -04:00
Messages drop incremental json object display; clean up code 2016-09-09 18:13:55 -04:00
Remote make --json-progress update meter when getting from git remote with rsync 2016-09-09 16:05:45 -04:00
RemoteDaemon make LocalRepo a newtype 2016-06-02 16:34:52 -04:00
standalone typo 2016-09-06 14:51:15 -04:00
static Revert "remove newlines from static js and css" 2014-06-13 02:20:39 -04:00
templates New url for git-remote-gcrypt, now maintained by spwhitton. 2016-07-05 11:30:58 -04:00
Types drop incremental json object display; clean up code 2016-09-09 18:13:55 -04:00
Upgrade Preserve execute bits of unlocked files in v6 mode. 2016-04-14 14:47:08 -04:00
Utility remove redundant constraint 2016-09-15 00:04:56 -04:00
.ghci workaround for ghci fragility in reusing objects compiled with ghc 2012-10-20 16:20:42 -04:00
.gitattributes update changelog location 2016-08-22 23:54:11 -04:00
.gitignore fix man page building 2016-06-02 16:54:58 -04:00
.mailmap alias for Yaroslav @ yahoo to mailmap 2015-09-09 12:38:59 -04:00
Annex.hs disentangle concurrency and message type 2016-09-09 12:57:42 -04:00
Assistant.hs move old ghc compat code into separate module; eliminate WITH_CLIBS 2016-02-15 11:47:33 -04:00
Backend.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
bash-completion.bash fix bash completion of filenames containing spaces 2015-07-20 11:17:35 -04:00
build.bat let build.bat also be run from cygwin terminal 2015-04-21 14:12:14 -04:00
BuildFlags.hs Remove the EKG build flag, since Gentoo for some reason decided to enable this flag, depsite it not being intended for production use and so enabled by default. 2016-07-06 15:09:56 -04:00
CHANGELOG fix bugs in handing of deep branches with sync and adjusted branches 2016-09-21 15:23:47 -04:00
CmdLine.hs Make --json and --quiet suppress automatic init messages 2016-09-05 15:34:38 -04:00
Command.hs Make --json and --quiet suppress automatic init messages 2016-09-05 15:34:38 -04:00
Common.hs avoid warnings about not exported System.Directory.isSymbolicLink 2016-04-28 15:18:11 -04:00
Config.hs refactor isBareRepo 2016-06-02 16:59:47 -04:00
COPYRIGHT fix lintian pedantry 2016-07-19 14:43:32 -04:00
Creds.hs plumb RemoteGitConfig through to decryptCipher 2016-05-23 17:33:32 -04:00
Crypto.hs cleanup 2016-05-23 17:51:15 -04:00
ghci fix script 2016-02-15 16:05:52 -04:00
git-annex.cabal drop incremental json object display; clean up code 2016-09-09 18:13:55 -04:00
git-annex.hs wire tasty's option parser into the main program option parser 2015-07-13 13:20:10 -04:00
git-union-merge.hs unify handling of unusual GIT_INDEX_FILE relative path 2016-05-17 14:42:06 -04:00
Git.hs Propigate GIT_DIR and GIT_WORK_TREE environment to external special remotes. 2016-05-06 12:26:44 -04:00
Limit.hs Fix bug in annex.largefiles mimetype= matching when git-annex is run in a subdirectory of the repository. 2016-04-12 14:19:34 -04:00
Logs.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Makefile Android: Fix disabling use of cp --reflink=auto, curl, sha224, and sha384. 2016-09-05 14:11:35 -04:00
Messages.hs drop incremental json object display; clean up code 2016-09-09 18:13:55 -04:00
NEWS Updated cabal file explictly lists source files. 2016-05-24 01:28:07 -04:00
README use https 2014-11-06 14:20:10 -04:00
Remote.hs Removed dependency on json library; all JSON is now handled by aeson. 2016-07-26 19:15:34 -04:00
Setup.hs Remove Makefile from cabal tarball; man page building is now handled by a small haskell program. 2016-05-31 13:58:13 -04:00
stack.yaml stack.yaml: Update to lts-7.0 (ghc 8) 2016-09-15 00:37:05 -04:00
Test.hs squelch build warning on windows 2016-09-06 14:59:32 -04:00
Types.hs remove module unused since switch to optparse-applicative 2016-01-21 12:59:50 -04:00
Upgrade.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -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/>