aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-15 16:13:30 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-15 16:13:30 -0400
commit6604062163fd85697f69128c5c6dcb35512254b9 (patch)
treea043b43f5ffbd9365f94dbc57db4e840e40a3b6a /CHANGELOG
parent0d66a45d49fd2983e5193312523afb96f34f8b76 (diff)
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.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7fbbf01b2..456b12981 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,9 @@ git-annex (6.20170215) UNRELEASED; urgency=medium
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.
+ * sync: Improve integration with receive.denyCurrentBranch=updateInstead,
+ displaying error messages from the remote then it fails to update
+ its checked out branch.
-- Joey Hess <id@joeyh.name> Tue, 14 Feb 2017 15:54:25 -0400