diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-26 15:53:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-26 15:53:05 -0400 |
| commit | e6b5913428189abb834bd52b6d4c562219aacdf6 (patch) | |
| tree | da7808ec8e3222a2023b7a28d7960513ca82d1e0 /Command | |
| parent | 5fb1f657d783d80b9c41bdbc7b159ff1483c271e (diff) | |
sync: print a hint about receive.denyNonFastForwards when a push fails
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Sync.hs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index d792f156f..0c3804c1f 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -184,7 +184,11 @@ pushRemote remote branch = go =<< needpush showStart "push" (Remote.name remote) next $ next $ do showOutput - inRepo $ pushBranch remote branch + ok <- inRepo $ pushBranch remote branch + unless ok $ do + warning $ unwords [ "Pushing to " ++ Remote.name remote ++ " failed." ] + showNote "(non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git config)" + return ok {- Pushes a regular branch like master to a remote. Also pushes the git-annex - branch. @@ -211,6 +215,9 @@ pushRemote remote branch = go =<< needpush - But overwriting of data on synced/git-annex can happen, in a race. - The only difference caused by using a forced push in that case is that - the last repository to push wins the race, rather than the first to push. + - + - The sync push will fail to overwrite if receive.denyNonFastforwards is + - set on the remote. -} pushBranch :: Remote -> Git.Ref -> Git.Repo -> IO Bool pushBranch remote branch g = tryIO (directpush g) `after` syncpush g |