mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Command
History
Joey Hess 501cc8623a assistant: Fix one-way assistant->assistant sync in direct mode. 
When in direct mode, update the master branch after committing to the
annex/direct/master branch. Also, update the synced/master branch.

This fixes a topology A->B where both A and B are in direct mode and
running the assistant, and a change is made to B. Before this fix, A pulled
the changes from B, but since they were only on the annex/direct/master
branch, it did not merge them.

Note that I considered making the assistant merge the
remotes/B/annex/direct/master, but decided to keep it simple and only merge
the sync branches as before.
2014-06-16 11:32:13 -04:00
..
Add.hs finish fixing windows timezone madness 2014-06-12 13:54:08 -04:00
AddUnused.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
AddUrl.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Assistant.hs assistant --autostart: Refuse to start in a bare git repository. 2014-02-28 19:47:05 -04:00
Commit.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
ConfigList.hs git-annex-shell: Make configlist automatically initialize a remote git repository, as long as a git-annex branch has been pushed to it, to simplify setup of remote git repositories, including via gitolite. 2014-03-26 14:22:21 -04:00
Copy.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Dead.hs refactor 2014-02-20 15:12:35 -04:00
Describe.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Direct.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Drop.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
DropKey.hs refactor 2014-01-26 15:53:01 -04:00
DropUnused.hs Added required content configuration. 2014-03-29 16:03:33 -04:00
EnableRemote.hs plumb creds from webapp to initremote 2014-02-11 14:07:56 -04:00
ExamineKey.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Find.hs findref: New command, like find but shows files in a specified git ref. 2014-04-17 18:41:24 -04:00
FindRef.hs findref: New command, like find but shows files in a specified git ref. 2014-04-17 18:41:24 -04:00
Fix.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Forget.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
FromKey.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
Fsck.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
FuzzTest.hs remove dead code 2014-02-08 14:52:25 -04:00
GCryptSetup.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Get.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Group.hs group: When no groups are specified to set, lists the current groups of a repository. 2014-05-16 14:43:40 -04:00
Help.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Import.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
ImportFeed.hs allow building with old feed lib, w/o pubdate 2014-04-21 00:37:14 -04:00
InAnnex.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Indirect.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Info.hs info: Allow use in a repository where annex.uuid is not set. 2014-04-15 19:42:49 -04:00
Init.hs reorg 2014-01-26 16:36:31 -04:00
InitRemote.hs plumb creds from webapp to initremote 2014-02-11 14:07:56 -04:00
List.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Lock.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Log.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
LookupKey.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Map.hs factor out getRemoteGitConfig 2014-05-16 16:08:20 -04:00
Merge.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
MetaData.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Migrate.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Mirror.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Move.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
NotifyChanges.hs added git-annex remotedaemon 2014-04-06 19:10:23 -04:00
NumCopies.hs reorg 2014-01-21 18:08:56 -04:00
PreCommit.hs unannex, uninit: Avoid committing after every file is unannexed, for massive speedup. 2014-03-21 14:41:05 -04:00
RecvKey.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
Reinit.hs reinit: New command that can initialize a new reposotory using the configuration of a previously known repository. Useful if a repository got deleted and you want to clone it back the way it was. 2014-04-15 20:13:35 -04:00
Reinject.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
ReKey.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
RemoteDaemon.hs added git-annex remotedaemon 2014-04-06 19:10:23 -04:00
Repair.hs remove Read instance for Ref 2014-02-19 01:19:57 -04:00
RmUrl.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Schedule.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Semitrust.hs refactor 2014-02-20 15:12:35 -04:00
SendKey.hs add desktop notifications 2014-03-22 14:12:19 -04:00
Status.hs export CreateProcess fields from Utility.Process 2014-06-10 19:20:14 -04:00
Sync.hs assistant: Fix one-way assistant->assistant sync in direct mode. 2014-06-16 11:32:13 -04:00
Test.hs expose tasty test suite's option parser 2014-01-21 00:08:43 -04:00
TransferInfo.hs reorg 2014-01-26 16:32:55 -04:00
TransferKey.hs add desktop notifications 2014-03-22 14:12:19 -04:00
TransferKeys.hs assistant: When there are multiple remotes giving different ways to access the same repository, honor remote cost settings and use the cheapest available. 2014-05-19 16:19:33 -04:00
Trust.hs trust, untrust, semitrust, dead: Warn when the trust level is overridden in .git/config. 2014-02-20 15:17:39 -04:00
Unannex.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Ungroup.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Uninit.hs export CreateProcess fields from Utility.Process 2014-06-10 19:20:14 -04:00
Unlock.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
Untrust.hs refactor 2014-02-20 15:12:35 -04:00
Unused.hs unused: Avoid checking view branches for unused files. 2014-06-04 14:03:41 -04:00
Upgrade.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
VAdd.hs view, vfilter: Add support for filtering tags and values out of a view, using !tag and field!=value. 2014-03-02 14:53:19 -04:00
VCycle.hs vadd: Allow listing multiple desired values for a field. 2014-03-02 15:36:45 -04:00
Version.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
VFilter.hs view, vfilter: Add support for filtering tags and values out of a view, using !tag and field!=value. 2014-03-02 14:53:19 -04:00
Vicfg.hs Added required content configuration. 2014-03-29 16:03:33 -04:00
View.hs view: Refuse to enter a view when no branch is currently checked out. 2014-03-02 16:00:56 -04:00
VPop.hs new section for metadata 2014-02-19 14:55:34 -04:00
Wanted.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Watch.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
WebApp.hs export CreateProcess fields from Utility.Process 2014-06-10 19:20:14 -04:00
Whereis.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
XMPPGit.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00