summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Added a commentGravatar CandyAngel2017-02-16
|
* (no commit message)Gravatar JohnKozak2017-02-16
|
* Added a commentGravatar andy2017-02-16
|
* (no commit message)Gravatar yarikoptic2017-02-16
|
* devblogGravatar Joey Hess2017-02-15
|
* sync: Improve integration with receive.denyCurrentBranch=updateInsteadGravatar Joey Hess2017-02-15
| | | | | | | | | | By displaying error messages from the remote then it fails to update its checked out branch. Error messages in the default receive.denyCurrentBranch are still suppressed, which matches user expectations. This commit was sponsored by Nick Daly on Patreon.
* simpler more generic processTranscript'Gravatar Joey Hess2017-02-15
| | | | | | | | This allows using functions that generate CreateProcess and passing the result to processTranscript', which is more flexible, and also simpler than the old interface. This commit was sponsored by Riku Voipio.
* Run ssh with -n whenever input is not being piped into itGravatar Joey Hess2017-02-15
| | | | | | | | | | | | | | | | | | | | ... to avoid it consuming stdin that it shouldn't. This fixes git-annex-checkpresentkey --batch remote, which didn't output results for all keys passed into it. Other git-annex commands that communicate with a remote over ssh may also have been consuming stdin that they shouldn't have, which could have impacted using them in eg, shell scripts. For example, a shell script reading files from stdin and passing them to git annex drop would be impacted by this bug, whenever git annex drop ran git-annex-shell checkpresent, it would consume part/all of the stdin that the shell script was supposed to consume. Fixed by adding a ConsumeStdin parameter to Annex.Ssh.sshOptions, which is used throughout git-annex to run ssh (in order for ssh connection caching to work). Every call site was checked to see if it used CreatePipe for stdin, and if not was marked NoConsumeStdin.
* add the new armel-ancient buildGravatar Joey Hess2017-02-15
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-02-15
|\
* | forgot to compile last commit; fix mistakesGravatar Joey Hess2017-02-15
| |
| * Added a commentGravatar lasitus2017-02-15
| |
| * (no commit message)Gravatar CandyAngel2017-02-15
| |
| * Added a commentGravatar lasitus2017-02-15
| |
| * removedGravatar lasitus2017-02-15
| |
| * Added a commentGravatar lasitus2017-02-15
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-02-14
|\
* | thoughtsGravatar Joey Hess2017-02-14
| |
| * Added a commentGravatar db48x2017-02-14
| |
| * Added a commentGravatar https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e2017-02-14
|/
* sync, merge: Fail when the current branch has no commits yet, instead of not ↵Gravatar Joey Hess2017-02-14
| | | | | | | | | | | | | | | | | merging in anything from remotes and appearing to succeed. At first I wanted to make it go ahead and merge into the newborn branch, so made it use Git.Branch.currentUnsafe to get the current branch. But that failed: fatal: ambiguous argument 'refs/heads/master..refs/heads/synced/master': unknown revision or path not in the working tree. A whole nother code path to handle merging into newborn branches seemed excessive, so went with displaying a warning and propigating failure status. This commit was sponsored by Brock Spratlen on Patreon.
* Added a commentGravatar lasitus2017-02-14
|
* add news item for git-annex 6.20170214Gravatar Joey Hess2017-02-14
|
* releasing package git-annex version 6.201702146.20170214Gravatar Joey Hess2017-02-14
|
* commentGravatar Joey Hess2017-02-14
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-02-14
|\
| * Added a commentGravatar lasitus2017-02-14
| |
* | responseGravatar Joey Hess2017-02-14
| |
| * (no commit message)Gravatar http://xgm.de/oid/2017-02-14
| |
| * Added a commentGravatar http://xgm.de/oid/2017-02-14
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-02-14
|\
* | avoid OSX build failure when there are no rpaths to removeGravatar Joey Hess2017-02-14
| |
| * removedGravatar https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e2017-02-14
| |
| * Added a comment: Retrieving initremote parameters for new userGravatar https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e2017-02-14
| |
| * Added a comment: Retrieving initremote parameters for new userGravatar https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e2017-02-14
|/
* devblogGravatar Joey Hess2017-02-13
|
* Work around sqlite's incorrect handling of umask when creating databases.Gravatar Joey Hess2017-02-13
| | | | | | | | | Refactored some common code into initDb. This only deals with the problem when creating new databases. If a repo got bad permissions into it, it's up to the user to deal with it. This commit was sponsored by Ole-Morten Duesund on Patreon.
* responseGravatar Joey Hess2017-02-13
|
* commentGravatar Joey Hess2017-02-13
|
* remove recent addition of receive.denyNonFastForwards to walkthroughGravatar Joey Hess2017-02-13
| | | | | | | | | | | | | | That is a dangerous setting, and not needed. I tried the walkthrough as it was without it, and syncing in the USB remote worked ok. There was a problem merging from origin/master, since that branch didn't exist yet, but that didn't prevent sync from working at all. To avoid even that problem, reordered the walkthrough, so files get committed to the repo before the remote gets set up. This commit was sponsored by Ole-Morten Duesund on Patreon.
* fix commit idGravatar Joey Hess2017-02-13
|
* include problem PairData in error messageGravatar Joey Hess2017-02-13
| | | | | | | | | | Users occasionally report this error firing, and I can't see why, so include the rejected PairData in the error message. This is safe even if it contains evil escape characters, because showing it displays them in escaped form. This commit was sponsored by Bruno BEAUFILS on Patreon.
* commentGravatar Joey Hess2017-02-13
|
* S3: Fix check of uuid file stored in bucket, which was not working.Gravatar Joey Hess2017-02-13
| | | | | | | | | | | | | | The check was broken in two ways.. First, nowhere did it error out when checkUUIDFile found a different UUID already in the file. Instead, it overwrote the uuid file. And, checkUUIDFile's implementation was for some reason always failing with a ConnectionClosed exception. Apparently something to do with using two different runResourceT's and a response getting GCed inbetween. I'm pretty sure that used to work, but changed to a more obviously correct implementation. This commit was sponsored by Peter Hogg on Patreon.
* commentGravatar Joey Hess2017-02-13
|
* commentGravatar Joey Hess2017-02-13
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-02-13
|\
* | fix OSX buildGravatar Joey Hess2017-02-13
| |
| * (no commit message)Gravatar lasitus2017-02-13
| |
* | correct spelling mistakesGravatar Edward Betts2017-02-12
| |