From 1788c39cd0742439b9bedc28bc10bc4d105b6c0f Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Fri, 14 Sep 2007 03:31:23 -0400 Subject: Remove pack.keep after ref updates in git-fetch If we are using a native packfile to perform a git-fetch invocation and the received packfile contained more than the configured limits of fetch.unpackLimit/transfer.unpackLimit then index-pack will output a single line saying "keep\t$sha1\n" to stdout. This line needs to be captured and retained so we can delete the corresponding .keep file ("$GIT_DIR/objects/pack/pack-$sha1.keep") once all refs have been safely updated. This trick has long been in use with git-fetch.sh and its lower level helper git-fetch--tool as a way to allow index-pack to save the new packfile before the refs have been updated and yet avoid a race with any concurrently running git-repack process. It was unfortunately lost when git-fetch.sh was converted to pure C and fetch--tool was no longer being invoked. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- fetch-pack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fetch-pack.h') diff --git a/fetch-pack.h b/fetch-pack.h index e06bf5b5c..cdcd84f2b 100644 --- a/fetch-pack.h +++ b/fetch-pack.h @@ -16,6 +16,6 @@ struct fetch_pack_args void setup_fetch_pack(struct fetch_pack_args *args); -struct ref *fetch_pack(const char *dest, int nr_heads, char **heads); +struct ref *fetch_pack(const char *dest, int nr_heads, char **heads, char **pack_lockfile); #endif -- cgit v1.2.1