Commit graph

29651 commits

Author SHA1 Message Date
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
Joey Hess
2d4a24bc6b
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-14 14:49:23 -04:00
lasitus
2233a50f45 Added a comment 2017-02-14 18:46:22 +00:00
Joey Hess
3aecb1d059
response 2017-02-14 14:21:58 -04:00
http://xgm.de/oid/
61f362b4ff 2017-02-14 18:14:24 +00:00
http://xgm.de/oid/
6a711d4a1d Added a comment 2017-02-14 18:03:27 +00:00
Joey Hess
de19340d7f
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-14 11:45:38 -04:00
Joey Hess
25e72dd30c
avoid OSX build failure when there are no rpaths to remove 2017-02-14 11:44:52 -04:00
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e
79e8d19850 removed 2017-02-14 00:05:09 +00:00
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e
6f31c717c2 Added a comment: Retrieving initremote parameters for new user 2017-02-14 00:04:50 +00:00
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e
3d786ebb4e Added a comment: Retrieving initremote parameters for new user 2017-02-14 00:03:35 +00:00
Joey Hess
7a06c91f7f
devblog 2017-02-13 17:42:03 -04:00