From c4e6730042e64e3b2f92626aee4a6b38a8f9c70c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 22 Jun 2011 21:19:52 -0400
Subject: commit git-annex branch when copying to a remote (locally)

Otherwise, the location log changes are only staged in its index,
and this can confuse matters if pulling or cloning from the remote.

The test suite was failing because this wasn't done.
---
 Remote/Git.hs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Remote')

diff --git a/Remote/Git.hs b/Remote/Git.hs
index 5b9d5d3df..c8290c9a7 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -17,7 +17,6 @@ import Types
 import Types.Remote
 import qualified GitRepo as Git
 import qualified Annex
-import qualified AnnexQueue
 import Locations
 import UUID
 import Utility
@@ -147,7 +146,7 @@ copyToRemote r key
 			Annex.eval a $ do
 				ok <- Content.getViaTmp key $
 					rsyncOrCopyFile r keysrc
-				AnnexQueue.flush True
+				Content.saveState
 				return ok
 	| Git.repoIsSsh r = do
 		g <- Annex.gitRepo
-- 
cgit v1.2.3