summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* flip catchDefaultIOGravatar Joey Hess2012-09-17
|
* better name for fallback sync refsGravatar Joey Hess2012-09-16
| | | | | | | | | | | Don't expose these as branches in refs/heads/. Instead hide them away in refs/synced/ where only show-ref will find them. Make unused only look at branches and tags, not these other things, so it won't care if some stale sync ref used to use a file. This means they don't need to be deleted, which could have led to an incoming sync being missed.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-09-16
|\
* | blog for the dayGravatar Joey Hess2012-09-16
| |
* | ensure outgoing sync pushes always succeed when repo is accessibleGravatar Joey Hess2012-09-16
| | | | | | | | | | | | | | | | | | The fallback branches pushed to contain the uuid of the pusher, which is ugly. That's why syncing doesn't normally use this method. The merger deletes fallback branches after merging them, to contain the ugliness, and so unused doesn't look at data from these branches. (The fallback git-annex branch is left behind for now.)
* | make the merger merge any equivilant sync branch into the current branchGravatar Joey Hess2012-09-16
| | | | | | | | Not just synced/master, but synced/UUID/master, for example
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo2012-09-16
| |
* | sync: Pushes the git-annex branch to remote/synced/git-annex, rather than ↵Gravatar Joey Hess2012-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | directly to remote/git-annex. This fixes a problem I was seeing in the assistant where two remotes would attempt to sync with one another at the same time, and both failed pushing the diverged git-annex branch. Then when both tried to resolve the failed push, they each modified their git-annex branch, which again each blocked the other from pushing into it. The result was that the git-annex branches were perpetually diverged (despite having the same content!) and once the assistant fell into this trap, it couldn't get out and always had to do the slow push/fail/pull/merge/push/fail cycle.
| * poll vote (Tahoe-LAFS)Gravatar http://meep.pl/2012-09-16
|/
* fixGravatar Joey Hess2012-09-16
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-09-16
|\
* | fix display of only blog posts tagged pollsGravatar Joey Hess2012-09-16
| |
| * Added a commentGravatar http://joeyh.name/2012-09-16
| |
| * poll vote (My phone (or MP3 player))Gravatar 2001:470:1f04:a19:200b:39d4:308f:4f6c2012-09-16
| |
| * poll vote (My phone (or MP3 player))Gravatar 2001:470:1f04:a19:200b:39d4:308f:4f6c2012-09-16
| |
| * poll vote (My phone (or MP3 player))Gravatar 2001:470:1f04:a19:200b:39d4:308f:4f6c2012-09-16
| |
| * Added a comment: thanx for fast help ;)Gravatar https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo2012-09-16
| |
| * poll vote (My phone (or MP3 player))Gravatar 2001:638:a00:2a:298a:16f8:72b0:85b52012-09-16
| |
| * poll vote (My phone (or MP3 player))Gravatar 80.217.244.1582012-09-16
| |
| * poll vote (Amazon S3)Gravatar 98.207.92.1242012-09-16
|/
* retitleGravatar Joey Hess2012-09-16
|
* Avoid crashing on encoding errors in filenames when writing transfer info ↵Gravatar Joey Hess2012-09-16
| | | | files and reading from checksum commands.
* closeGravatar Joey Hess2012-09-16
|
* closeGravatar Joey Hess2012-09-16
|
* reinject: When the provided file doesn't match, leave it where it is, rather ↵Gravatar Joey Hess2012-09-16
| | | | than moving to .git/annex/bad/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-09-15
|\
* | blog for the dayGravatar Joey Hess2012-09-15
| |
* | Support repositories created with --separate-git-dir. Closes: #684405Gravatar Joey Hess2012-09-15
| |
| * poll vote (Amazon Glacier)Gravatar 188.61.52.2552012-09-16
| |
| * poll vote (Tahoe-LAFS)Gravatar 188.61.52.2552012-09-16
| |
| * poll vote (Amazon Glacier)Gravatar 188.61.52.2552012-09-16
| |
* | more descriptive name for oneshotGravatar Joey Hess2012-09-15
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-09-15
|\|
* | bugfix: avoid staging but not committing changes to git-annex branchGravatar Joey Hess2012-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Branch.get is not able to see changes that have been staged to the index but not committed. This is a limitation of git cat-file --batch; when reading from the index, as opposed to from a branch, it does not notice changes made after the first time it reads the index. So, had to revert the changes made in 1f73db3469e29448bcb1520893de11b23da6fb1f to make annex.alwayscommit=false stage changes. Also, ensure that Branch.change and Branch.get always see changes at all points during a commit, by not deleting journal files when staging to the index. Delete them only after committing the branch. Before, there was a race during commits where a different git-annex could see out-of-date info from the branch while a commit was in progress. That's also done when updating the branch to merge in remote branches. In the case where the local git-annex branch has had changes pushed into it that are not yet reflected in the index, and there are journalled changes as well, a merge commit has to be done.
| * Added a commentGravatar http://joeyh.name/2012-09-16
| |
* | eliminate some commits to the git-annex branchGravatar Joey Hess2012-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits used to be made to the git-annex branch whenever there were journalled changes from a previous command, and the current command looked up the value of a file. This no longer happens. This means that transferkey, which is a oneshot command that stages changes, can be run multiple times by the assistant, without each of them committing the changes made by the command before. Which will be a lot faster and use less space by batching up the commits. Commits still happen if a remote git-annex branch has been changed and is merged in.
* | Revert "add catFileIndex"Gravatar Joey Hess2012-09-15
| | | | | | | | | | This interface is not a good idea, because a running git cat-file --batch does not notice when existing files in the index are changed.
* | run git coprocesses with gitEnvGravatar Joey Hess2012-09-15
| |
* | add catFileIndexGravatar Joey Hess2012-09-15
| |
| * poll vote (Amazon S3)Gravatar 80.187.96.1362012-09-15
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo2012-09-15
| |
| * poll vote (My phone (or MP3 player))Gravatar 89.236.47.662012-09-15
| |
* | remove withIndexUpdate helperGravatar Joey Hess2012-09-15
| |
* | found some bugsGravatar Joey Hess2012-09-15
| |
| * Added a commentGravatar http://joeyh.name/2012-09-15
| |
| * poll vote (My phone (or MP3 player))Gravatar 128.61.104.522012-09-15
| |
| * poll vote (Amazon Glacier)Gravatar 87.79.135.2292012-09-15
| |
| * poll vote (My phone (or MP3 player))Gravatar 2001:980:45c4:1:a5a9:c33:f9a:2d052012-09-15
| |
| * (no commit message)Gravatar http://www.dbruhn.de/2012-09-15
| |
| * poll vote (My phone (or MP3 player))Gravatar 88.67.98.1822012-09-15
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 22:44:57 +0000