On Thu, Apr 21, 2016 at 03:20:39PM -0700, Junio C Hamano wrote: > * jk/push-client-deadlock-fix (2016-04-20) 5 commits > - t5504: drop sigpipe=ok from push tests > - fetch-pack: isolate sigpipe in demuxer thread > - send-pack: isolate sigpipe in demuxer thread > - run-command: teach async threads to ignore SIGPIPE > - send-pack: close demux pipe before finishing async process > > "git push" from a corrupt repository that attempts to push a large > number of refs deadlocked waiting for a rejection from the > receiving end that will never come. > > Will merge to 'next'.
Minor nit, but the deadlock is the other way around: the rejection showed up and our demuxer is blocked writing to a reader who does not care about it. Might be worth fixing since this text goes into the topic merge commit (though I really hope nobody ever has to debug it enough ever again for that distinction to matter :) ). > * da/user-useconfigonly (2016-04-01) 2 commits > - ident: give "please tell me" message upon useConfigOnly error > - ident: check for useConfigOnly before auto-detection of name/email > > The "user.useConfigOnly" configuration variable makes it an error > if users do not explicitly set user.name and user.email. However, > its check was not done early enough and allowed another error to > trigger, reporting that the default value we guessed from the > system setting was unusable. This was a suboptimal end-user > experience as we want the users to set user.name/user.email without > relying on the auto-detection at all. > > Waiting for Acks. > ($gmane/290340) I think you are waiting for the Ack from the original author on your tweaks. But FWIW, what you have queued looks good to me. > * dk/gc-more-wo-pack (2016-01-13) 4 commits > - gc: clean garbage .bitmap files from pack dir > - t5304: ensure non-garbage files are not deleted > - t5304: test .bitmap garbage files > - prepare_packed_git(): find more garbage > > Follow-on to dk/gc-idx-wo-pack topic, to clean up stale > .bitmap and .keep files. > > Waiting for a reroll. > ($gmane/284368). This one's getting pretty stale, but as I recall was pretty close to done. I'll try to give it a look in the next couple of days. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
