[PATCH v4 00/11] Resend sp/maint-dumb-http-pack-reidx
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Apr 19, 2010, 14:23 UTC
- Message-ID
- <1271686990-16363-1-git-send-email-spearce@spearce.org>
- In-Reply-To
- <20100418115744.0000238b@unknown>
This is a resend of the last half of the series, from patch 6/11 to the end, to address some minor review comments.
Junio, I think you need to reset my branch to 0da8b2e7c80a6d ("http.c: Don't store destination name in structures"), and then apply this group.
Total series diff since v3 is this shocking one line change, most of the edits were to commit messages:
diff --git a/http.c b/http.c index 83f6047..0813c9e 100644 --- a/http.c +++ b/http.c @@ -1028,7 +1028,6 @@ int finish_http_pack_request(struct http_pack_request *preq) const char *ip_argv[8]; close_pack_index(p); - unlink(sha1_pack_index_name(p->sha1)); fclose(preq->packfile); preq->packfile = NULL; @@ -1062,6 +1061,8 @@ int finish_http_pack_request(struct http_pack_request *preq) return -1; } + unlink(sha1_pack_index_name(p->sha1)); + if (move_temp_to_file(preq->tmpfile, sha1_pack_name(p->sha1)) || move_temp_to_file(tmp_idx, sha1_pack_index_name(p->sha1))) { free(tmp_idx);