{"thread":{"id":"30190","subject":"Post 1.7.10 cycle","startedAt":"2012-04-10T00:22:05Z","lastAt":"2012-04-10T18:55:58Z","messageCount":2,"participants":["Junio C Hamano","René Scharfe"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"188829","messageId":"7v1unwtp02.fsf@alter.siamese.dyndns.org","threadId":"30190","inReplyTo":null,"subject":"Post 1.7.10 cycle","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-04-10T00:22:05Z","receivedAt":"2012-04-10T00:22:05Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"It's now time to pick among the topics that have been cooking in 'next'\nand 'pu' which ones to start moving to 'master' in what order.\n\nI've already kicked one topic out of 'next' as it regresses the http proxy\nsupport, but I haven't spent enough time to look at the other topics again\nclosely enough to decide.  I was hoping that we could feed a handful of\ntopics every few days to 'master'.\n\nI think the following topics (in 'next') are more or less ready:\n\nda/difftool-test\njn/diffstat-tests\njc/commit-hook-authorship\ntr/maint-word-diff-regex-sticky\nrs/unpack-trees-leakfix\njc/diff-algo-cleanup\nnd/stream-more\nzj/test-cred-helper-nicer-prove\nnl/rebase-i-cheat-sheet\njc/maint-clean-nested-worktree-in-subdir\njh/notes-merge-in-git-dir-worktree\n\nThese (in 'next') are \"ready\" code-wise, but we would need to see the end\nof the \"upstream\", \"current\" or \"beginner\" discussion:\n\nct/advise-push-default\nmm/push-default-switch-warning\n\n\nAnd I think these in 'pu' are ready for 'next':\n\njk/diff-no-rename-empty\nrs/combine-diff-zero-context-at-the-beginning\njc/commit-unedited-template\njk/http-backend-keep-committer-ident-env\njc/push-upstream-sanity\njk/branch-quiet\njc/run-hook-env-1\nsl/autoconf\njb/am-include\njc/am-report-3way\njc/fmt-merge-msg-people\nwk/gitweb-snapshot-use-if-modified-since\nbw/spawn-via-shell-path\nit/fetch-pack-many-refs\njn/debian-customizes-default-editor\njk/add-p-skip-conflicts\n\n\nOthers not listed here fall into one of the following categories:\n\n (1) known to be incomplete;\n (2) stalled;\n (3) I simply haven't stared at them long enough; or\n (4) I don't have strong opinion in the area in general.\n\nI'll do a proper \"What's cooking\" later tonight or tomorrow.\n"},{"id":"188898","messageId":"4F84823E.6030308@lsrfire.ath.cx","threadId":"30190","inReplyTo":"7v1unwtp02.fsf@alter.siamese.dyndns.org","subject":"Re: Post 1.7.10 cycle","fromName":"René Scharfe","fromEmail":"rene.scharfe@lsrfire.ath.cx","sentAt":"2012-04-10T18:55:58Z","receivedAt":"2012-04-10T18:55:58Z","isPatch":false,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"Am 10.04.2012 02:22, schrieb Junio C Hamano:\n> It's now time to pick among the topics that have been cooking in 'next'\n> and 'pu' which ones to start moving to 'master' in what order.\n> \n> I've already kicked one topic out of 'next' as it regresses the http proxy\n> support, but I haven't spent enough time to look at the other topics again\n> closely enough to decide.  I was hoping that we could feed a handful of\n> topics every few days to 'master'.\n> \n> I think the following topics (in 'next') are more or less ready:\n\n> rs/unpack-trees-leakfix\n\nPlease apply the following patch before this one.  It makes sure that it\nis a pure leak fix.  Without the added check, it'd change the behaviour\nslightly: with o->merge == 0, we'd call mark_ce_used() on src[0]; before\nit would point to the leaked version, but after the patch it points to\nthe version that has been added using do_add_entry().  Not sure if this\ncan lead to any user-visible consequences, but this is cleaner.\n\n-- >8 --\nSubject: unpack-trees: don't perform any index operation if we're not merging\n\nsrc[0] points to the index entry in the merge case and to the first\ntree to unpack in the non-merge case.  We only want to mark the index\nentry, so check first if we're merging.\n\nSigned-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>\n---\n unpack-trees.c |    2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/unpack-trees.c b/unpack-trees.c\nindex 7c9ecf6..60b728e 100644\n--- a/unpack-trees.c\n+++ b/unpack-trees.c\n@@ -772,7 +772,7 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str\n \tif (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)\n \t\treturn -1;\n \n-\tif (src[0]) {\n+\tif (o->merge && src[0]) {\n \t\tif (ce_stage(src[0]))\n \t\t\tmark_ce_used_same_name(src[0], o);\n \t\telse\n-- \n1.7.10\n"}]}