Commit graph

29662 commits

Author SHA1 Message Date
mhauru
f49066d9c6 2017-02-19 18:48:59 +00:00
openmedi
f339047be9 Added a comment 2017-02-19 15:27:08 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
a1e43697b6 2017-02-18 16:28:45 +00:00
openmedi
66c822b489 2017-02-18 13:42:45 +00:00
openmedi
475773a06b 2017-02-18 13:41:57 +00:00
Joey Hess
32782ab324
linkify 2017-02-17 15:58:32 -04:00
Joey Hess
4bc1e03bb7
devblog 2017-02-17 15:56:38 -04:00
Joey Hess
a700fdf5cf
documentation updates for new receive.denyCurrentBranch=updateInstead support
This commit was sponsored by andrea rota.
2017-02-17 15:43:16 -04:00
Joey Hess
e6857e75a6
sync hack to make updateInstead work on eg FAT
sync: When syncing with a local repository located on a crippled
filesystem, run the post-receive hook there, since it wouldn't get run
otherwise. This makes pushing to repos on FAT-formatted removable drives
update them when receive.denyCurrentBranch=updateInstead.

Made Remote.Git export onLocal, which was cleaned up to not have so many
caveats about its use.

This commit was sponsored by Jeff Goeke-Smith on Patreon.
2017-02-17 15:21:52 -04:00
Joey Hess
00464fbed7
have onLocal stop any coprocesses, not only cat-file
I have not seen any other coprocesses being started, but let's avoid
problems if any do for whatever reason.
2017-02-17 14:30:18 -04:00
Joey Hess
d074532aff
post-recive hook to make updateInstead work in direct mode and adjusted branches
* Added post-recieve hook, which makes updateInstead work with direct
  mode and adjusted branches.
* init: Set up the post-receive hook.

This commit was sponsored by Fernando Jimenez on Patreon.
2017-02-17 14:04:43 -04:00
Joey Hess
4594bece40
make git-annex:git-annex push quiet again
Recent changes had a side effect of displaying errors in the fairly
common case when this push fails. Since the synced/git-annex push
is always forced, those errors are noise, so hide again.

This means 3 separate pushes are done now, where before it only made 2.
A bit more expensive, but ssh connection caching eliminates most of
the costs.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2017-02-17 14:03:17 -04:00
Joey Hess
de4d50e9d0
thoughts 2017-02-17 12:57:55 -04:00
Joey Hess
f36d789eef
comment 2017-02-17 12:36:23 -04:00
Joey Hess
e93d4bfa85
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-17 12:31:47 -04:00
yarikoptic
7fa1329877 initial whining 2017-02-17 15:30:32 +00:00
lasitus
ccdb4bdfa1 Added a comment 2017-02-17 03:23:46 +00:00
yarikoptic
2f601791bf 2017-02-17 01:57:11 +00:00
binx
54ce959986 2017-02-17 00:01:12 +00:00
Joey Hess
a2b848aba2
cleanup 2017-02-16 16:00:18 -04:00
JohnKozak
fa244ac433 removed 2017-02-16 18:45:41 +00:00
JohnKozak
b15ad04f33 Added a comment 2017-02-16 18:44:36 +00:00
JohnKozak
9d563d6f4c remove crud from transcript 2017-02-16 17:59:54 +00:00
Joey Hess
d0651bb567
make query commands not output extraneous messages
config group groupwanted numcopies schedule wanted required:  Avoid
displaying extraneous messages about repository auto-init, git-annex branch
merging, etc, when being used to get information.
2017-02-16 13:24:35 -04:00
yarikoptic
baa2ab2c7d Added a comment 2017-02-16 15:54:18 +00:00
CandyAngel
bb262be6f0 Added a comment 2017-02-16 14:10:56 +00:00
JohnKozak
81d0eb3567 2017-02-16 13:56:30 +00:00
andy
b36e8e53c3 Added a comment 2017-02-16 06:34:50 +00:00
yarikoptic
9cdb0125c7 2017-02-16 03:49:46 +00:00
Joey Hess
de671658ee
devblog 2017-02-15 16:44:10 -04:00
Joey Hess
a73c8ce4a1
sync: Improve integration with receive.denyCurrentBranch=updateInstead
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.
2017-02-15 16:13:30 -04:00
Joey Hess
113b10cdc9
simpler more generic processTranscript'
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.
2017-02-15 16:02:10 -04:00
Joey Hess
f07af03018
Run ssh with -n whenever input is not being piped into it
... 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.
2017-02-15 15:08:46 -04:00
Joey Hess
a0222ea7eb
add the new armel-ancient build 2017-02-15 14:43:19 -04:00
Joey Hess
5e16a918ee
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-15 13:56:01 -04:00
Joey Hess
2af5f727a9
forgot to compile last commit; fix mistakes 2017-02-15 13:55:06 -04:00
lasitus
c8f87f1433 Added a comment 2017-02-15 16:01:39 +00:00
CandyAngel
aadd43e81c 2017-02-15 11:13:25 +00:00
lasitus
fb356bd39c Added a comment 2017-02-15 02:17:25 +00:00
lasitus
aec64ce496 removed 2017-02-15 02:14:05 +00:00
lasitus
5227da6d8a Added a comment 2017-02-15 02:13:25 +00:00
Joey Hess
9fe402187e
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-14 17:42:25 -04:00
Joey Hess
e8b9565b6f
thoughts 2017-02-14 17:39:37 -04:00
db48x
1f7b8373cc Added a comment 2017-02-14 21:10:13 +00:00
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e
f84a16f2fa Added a comment 2017-02-14 20:21:41 +00:00
Joey Hess
69baa45f14
sync, merge: Fail when the current branch has no commits yet, instead of not 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.
2017-02-14 16:09:55 -04:00
lasitus
9d690a18bd Added a comment 2017-02-14 19:08:38 +00:00
Joey Hess
248f48f754
add news item for git-annex 6.20170214 2017-02-14 14:56:57 -04:00
Joey Hess
95390f0c27
releasing package git-annex version 6.20170214 2017-02-14 14:56:11 -04:00
Joey Hess
4e3f4f6e4e
comment 2017-02-14 14:54:53 -04:00