diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-12 14:27:46 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-12 14:27:46 -0400 |
| commit | 75c52e9162ed1d172242979532201ec08df84e3c (patch) | |
| tree | d96e3d5f4da081149ff86db5da5a77d1e248f14b | |
| parent | 1c49e101b7454fb1fd83f468f28bfacb6c7194cf (diff) | |
repair: Prevent auto gc from happening when fetching from a remote.
3 files changed, 13 insertions, 5 deletions
diff --git a/Git/Repair.hs b/Git/Repair.hs index 0769ecb30..77a592b4e 100644 --- a/Git/Repair.hs +++ b/Git/Repair.hs @@ -135,11 +135,16 @@ retrieveMissingObjects missing referencerepo r pullremotes tmpr rmts fetchrefs (FsckFoundMissing stillmissing t) , pullremotes tmpr rmts fetchrefs ms ) - fetchfrom fetchurl ps = runBool $ - [ Param "fetch" - , Param fetchurl - , Params "--force --update-head-ok --quiet" - ] ++ ps + fetchfrom fetchurl ps fetchr = runBool ps' fetchr' + where + ps' = + [ Param "fetch" + , Param fetchurl + , Params "--force --update-head-ok --quiet" + ] ++ ps + fetchr' = fetchr { gitGlobalOpts = gitGlobalOpts fetchr ++ nogc } + nogc = [ Param "-c", Param "gc.auto=0" ] + -- fetch refs and tags fetchrefstags = [ Param "+refs/heads/*:refs/heads/*", Param "--tags"] -- Fetch all available refs (more likely to fail, diff --git a/debian/changelog b/debian/changelog index 1faee6522..9ac33fed1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ git-annex (5.20140928) UNRELEASED; urgency=medium * Support building with yesod 1.4. * S3: Fix embedcreds=yes handling for the Internet Archive. * map: Handle .git prefixed remote repos. Closes: #614759 + * repair: Prevent auto gc from happening when fetching from a remote. -- Joey Hess <joeyh@debian.org> Mon, 29 Sep 2014 14:07:51 -0400 diff --git a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__.mdwn b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__.mdwn index 5407db36a..e61d44883 100644 --- a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__.mdwn +++ b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__.mdwn @@ -36,3 +36,5 @@ git-annex: repair: 1 failed # End of transcript or log. """]] + +> Provisionally [[done]]; see comment. --[[Joey]] |