mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

sync: As well as the synced/git-annex push, attempt a git-annex:git-annex push, as long as the remote branch is an ancestor of the local branch, to better support bare git repos.

Browse source 
See my comment in the bug report for analysis; basically this is safe
because it's a non-forced push, so won't lose history. Even if it was a
forced push or somehow races, things will eventually become consistent and
no git-annex branch info will be lost.

(This used to be done, but it forgot to do it since version 4.20130909.)
This commit is contained in:
Joey Hess 2015-02-27 14:49:56 -04:00
parent 1082b1dbdb
commit 289881bdb8
3 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
debian/changelog vendored
View file

@ -15,6 +15,10 @@ git-annex (5.2015022) UNRELEASED; urgency=medium
https://ghc.haskell.org/trac/ghc/ticket/7695
This prevents localization from working, but git-annex
is not localized anyway.
* sync: As well as the synced/git-annex push, attempt a
git-annex:git-annex push, as long as the remote branch
is an ancestor of the local branch, to better support bare git repos.
(This used to be done, but it forgot to do it since version 4.20130909.)
-- Joey Hess <id@joeyh.name> Thu, 19 Feb 2015 14:16:03 -0400