summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar https://www.google.com/accounts/o8/id?id=AItOawkJafmCf-sg9_OM0pynFYM3AO4WCgJiaMI <Michele@web>2013-10-27 23:06:03 +0000
committerGravatar admin <admin@branchable.com>2013-10-27 23:06:03 +0000
commit906f9c3acfe55afbdaad8d0afe7098e1033c0621 (patch)
treeacd45cfd9e5753b48ffa7b8ce13069a991dcd22a /doc
parent6194eeec9fbb3c1a4b6033cc19e00dfa3f28732e (diff)
Added a comment: still cannot push when remote has renames
Diffstat (limited to 'doc')
-rw-r--r--doc/forum/receiving_indirect_renames_on_direct_repo___63__/comment_2_8c86dfc99f0b9040402c9d746decda53._comment41
1 files changed, 41 insertions, 0 deletions
diff --git a/doc/forum/receiving_indirect_renames_on_direct_repo___63__/comment_2_8c86dfc99f0b9040402c9d746decda53._comment b/doc/forum/receiving_indirect_renames_on_direct_repo___63__/comment_2_8c86dfc99f0b9040402c9d746decda53._comment
new file mode 100644
index 000000000..8b4ff46a4
--- /dev/null
+++ b/doc/forum/receiving_indirect_renames_on_direct_repo___63__/comment_2_8c86dfc99f0b9040402c9d746decda53._comment
@@ -0,0 +1,41 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkJafmCf-sg9_OM0pynFYM3AO4WCgJiaMI"
+ nickname="Michele"
+ subject="still cannot push when remote has renames"
+ date="2013-10-27T23:06:03Z"
+ content="""
+now, I went again through docs, and i realized how stupid was issuing a git pull on a direct repo. thanks for your patience.
+
+but, i double checked the configuration, I assume \"receive.denyNonFastForwards\" is false by default, but anyway I set it up explicitely so that now my git config (on the linux indirect repo - with respect to my previous example, I got rid of the \"extra\" bare repo in the middle) shows:
+
+ $ git config --list
+ user.email=m@g.com
+ user.name=michele
+ core.repositoryformatversion=0
+ core.filemode=true
+ core.bare=false
+ core.logallrefupdates=true
+ annex.uuid=d084e0fd-95a7-4c98-a206-fbf2c85b779d
+ annex.version=3
+ receive.denynonfastforwards=false
+
+still I am receiving the push refusal:
+
+ M:\win>git annex sync
+ commit
+ ok
+ pull origin
+ ok
+ push origin
+ To ssh://michele@home/home/michele/casa
+ ! [rejected] master -> synced/master (non-fast-forward)
+ error: failed to push some refs to 'ssh://michele@home/home/michele/casa'
+ hint: Updates were rejected because a pushed branch tip is behind its remote
+ hint: counterpart. Check out this branch and merge the remote changes
+ hint: (e.g. 'git pull') before pushing again.
+ hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+ failed
+ git-annex: sync: 1 failed
+
+Same happens with a bare repository in the middle. BTW: the windows \"client\" repository is behind NAT, so that the linux indirect doesn't actively sync against it: could that be source of the problem ?
+"""]]