From ef5e9aa0823a5fd6893afd6247a7a0d4fbebc07c Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 10 May 2024 13:55:46 -0400
Subject: [PATCH] git-remote-annex working

A few bugfixes. Have not tested extensively, but a push followed by a
clone worked.

Sponsored-by: Nicholas Golder-Manning on Patreon
---
 CmdLine/GitRemoteAnnex.hs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/CmdLine/GitRemoteAnnex.hs b/CmdLine/GitRemoteAnnex.hs
index 62f739cedc..25c7f6b9c0 100644
--- a/CmdLine/GitRemoteAnnex.hs
+++ b/CmdLine/GitRemoteAnnex.hs
@@ -32,6 +32,7 @@ import Git.Types
 import Logs.Difference
 import Annex.Init
 import Annex.Content
+import Annex.Perms
 import Remote.List
 import Remote.List.Util
 import Utility.Tmp
@@ -185,6 +186,7 @@ push :: State -> Remote -> [String] -> Annex ([String], State)
 push st rmt ls = do
 	let (refspecs, ls') = collectRefSpecs ls
 	(responses, trackingrefs) <- calc refspecs ([], trackingRefs st)
+	updateTrackingRefs rmt trackingrefs
 	(ok, st') <- if M.null trackingrefs
 		then pushEmpty st rmt
 		else if any forcedPush refspecs
@@ -195,10 +197,10 @@ push st rmt ls = do
 	if ok
 		then do
 			sendresponses responses
-			-- Update the tracking refs to reflect the push.
-			updateTrackingRefs rmt trackingrefs
 			return (ls', st' { trackingRefs = trackingrefs })
 		else do
+			-- Restore the old tracking refs 
+			updateTrackingRefs rmt (trackingRefs st)
 			sendresponses $
 				map (const "error push failed") refspecs
 			return (ls', st')
@@ -271,7 +273,7 @@ fullPush st rmt refs = guardPush st $ do
 guardPush :: State -> Annex (Bool, State) -> Annex (Bool, State)
 guardPush st a = catchNonAsync a $ \ex -> do
 	liftIO $ hPutStrLn stderr $
-		"Push faild (" ++ show ex ++ ")"
+		"Push failed (" ++ show ex ++ ")"
 	return (False, st { manifestCache = Nothing })
 
 -- Incremental push of only the refs that changed.
@@ -591,7 +593,9 @@ uploadManifest rmt manifest =
 		-- is configured to require only cryptographically secure
 		-- keys, which it is not.
 		objfile <- calcRepo (gitAnnexLocation mk)
-		unlessM (isJust <$> linkOrCopy mk (toRawFilePath tmp) objfile Nothing)
+		res <- modifyContentDir objfile $
+			linkOrCopy mk (toRawFilePath tmp) objfile Nothing
+		unless (isJust res)
 			uploadfailed
 		-- noRetry because manifest content is not stable
 		ok <- upload rmt mk (AssociatedFile Nothing)