Re: What's cooking in git.git (Aug 2014, #03; Wed, 20)
On Wed, Aug 20, 2014 at 04:17:33PM -0700, Junio C Hamano wrote: * br/http-init-fix (2014-08-18) 2 commits - http: style fixes for curl_multi_init error check - http.c: die if curl_*_init fails Needs S-o-b from peff for the topmost one. What you have queued looks good. Please add in: Signed-off-by: Jeff King p...@peff.net * jn/header-dependencies (2014-08-10) 1 commit - Update hard-coded header dependencies Needs further discussions on the list. We could take Jonathan's patch in the meantime, which is a strict improvement. I'll try to push the other part of the discussion forward. If that reaches agreement quickly, we can do it instead of Jonathan's patch rather than on top. -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
Re: What's cooking in git.git (Aug 2014, #03; Wed, 20)
On Wed, Aug 20, 2014 at 04:17:33PM -0700, Junio C Hamano wrote: * hv/submodule-config (2014-06-30) 4 commits (merged to 'next' on 2014-07-17 at 5e0ce45) + do not die on error of parsing fetchrecursesubmodules option + use new config API for worktree configurations of submodules + extract functions for submodule config set and lookup + implement submodule config cache for lookup of submodule names Will cook in 'next'. While using the config API for implementing my recursive fetch. I discovered a bug in my API here. In submodule_from_name() the lookup of the gitmodule sha1 is missing. So currently you would have to pass in the gitmodule sha1 instead of the commit sha1 as documented. I will extend the test and fix this. Cheers Heiko -- 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
Re: What's cooking in git.git (Aug 2014, #03; Wed, 20)
Heiko Voigt hvo...@hvoigt.net writes: On Wed, Aug 20, 2014 at 04:17:33PM -0700, Junio C Hamano wrote: * hv/submodule-config (2014-06-30) 4 commits (merged to 'next' on 2014-07-17 at 5e0ce45) + do not die on error of parsing fetchrecursesubmodules option + use new config API for worktree configurations of submodules + extract functions for submodule config set and lookup + implement submodule config cache for lookup of submodule names Will cook in 'next'. While using the config API for implementing my recursive fetch. I discovered a bug in my API here. In submodule_from_name() the lookup of the gitmodule sha1 is missing. So currently you would have to pass in the gitmodule sha1 instead of the commit sha1 as documented. I will extend the test and fix this. OK, I do not mind temporarily kicking this back to 'pu', so that you can replace these wholesale instead of doing an incremental patch on top, when we rewind 'next' in a few days. Thanks. -- 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
What's cooking in git.git (Aug 2014, #03; Wed, 20)
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. A few fixes for regressions have been posted since 2.1 was tagged, which I'd like to address before moving any topic to 'master', rewinding 'next', or doing anything for the 2.2 cycle. Hopefully by the end of this week 'next' will be rewound and rebuilt and then we can start taking patches for new topics in earnest from that point. You can find the changes described here in the integration branches of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -- [New Topics] * br/http-init-fix (2014-08-18) 2 commits - http: style fixes for curl_multi_init error check - http.c: die if curl_*_init fails Needs S-o-b from peff for the topmost one. * br/imap-send-simplify-tunnel-child-process (2014-08-20) 2 commits - imap-send.c: imap_folder - imap_server_conf.folder - git-imap-send: simplify tunnel construction Will merge to 'next'. * jc/config-mak-document-darwin-vs-macosx (2014-08-15) 1 commit - config.mak.uname: add hint on uname_R for MacOS X (this branch uses km/no-apple-common-crypto-on-darwin-8-and-below.) Will merge to 'next'. * jk/fix-profile-feedback-build (2014-08-19) 1 commit - Makefile: make perf tests optional for profile build Fix profile-feedback build broken in 2.1 for tarball releases. Will merge to 'next'. * jk/pack-shallow-always-without-bitmap (2014-08-12) 1 commit - pack-objects: turn off bitmaps when we see --shallow lines Reachability bitmaps do not work with shallow operations. Will merge to 'next'. * jn/header-dependencies (2014-08-10) 1 commit - Update hard-coded header dependencies Needs further discussions on the list. * jn/unpack-trees-checkout-m-carry-deletion (2014-08-13) 4 commits - SQUASH??? - checkout -m: attempt merge when deletion of path was staged - unpack-trees: use 'cuddled' style for if-else cascade - unpack-trees: simplify 'all other failures' case Needs tests; perhaps squashing in the topmost SQUASH??? is enough. * km/no-apple-common-crypto-on-darwin-8-and-below (2014-08-15) 1 commit - config.mak.uname: set NO_APPLE_COMMON_CRYPTO on older systems (this branch is used by jc/config-mak-document-darwin-vs-macosx.) Build automation for older versions of MacOS X. Will merge to 'next'. * nd/large-blobs (2014-08-18) 5 commits - diff: shortcut for diff'ing two binary SHA-1 objects - diff --stat: mark any file larger than core.bigfilethreshold binary - diff.c: allow to pass more flags to diff_populate_filespec - sha1_file.c: do not die failing to malloc in unpack_compressed_entry - wrapper.c: introduce gentle xmallocz that does not die() Will merge to 'next'. * nd/mv-code-cleaning (2014-08-11) 9 commits - SQUASH??? - mv: no SP between function name and the first opening parenthese - mv: combine two if(s) - mv: unindent one level for directory move code - mv: move index search code out - mv: remove an if that's always true - mv: split submodule move preparation code out - mv: flatten error handling code block - mv: mark strings for translations Needs rerolling to account for the topmost SQUASH??? simplification. * nd/strbuf-utf8-replace (2014-08-11) 1 commit - utf8.c: fix strbuf_utf8_replace() consuming data beyond input string Will merge to 'next'. * rr/mergetool-temporary-filename-tweak (2014-08-19) 1 commit - Allow the user to change the temporary file name for mergetool Needs rerolling (new paragraph in doc seems to be in a wrong place) * rs/clean-menu-item-defn (2014-08-18) 1 commit - clean: use f(void) instead of f() to declare a pointer to a function without arguments Will merge to 'next'. * rs/inline-compat-path-macros (2014-08-18) 1 commit - turn path macros into inline function Will merge to 'next'. * rs/refresh-beyond-symlink (2014-08-10) 1 commit - read-cache: check for leading symlinks when refreshing index git add x where x that used to be a directory has become a symbolic link to a directory misbehaved. Will merge to 'next'. * sb/blame-msg-i18n (2014-08-12) 1 commit - builtin/blame.c: add translation to warning about failed revision walk Will merge to 'next'. * sb/plug-leaks (2014-08-10) 2 commits - clone.c: don't leak memory in cmd_clone - remote.c: don't leak the base branch name in format_tracking_info Will merge to 'next'. * sb/prepare-revision-walk-error-check (2014-08-12) 1 commit - prepare_revision_walk(): check for return value in all places Will merge to 'next'. * sb/unpack-trees-dead-code-removal (2014-08-12) 2 commits - SQUASH??? - unpack-tree.c: remove dead code Will discard (jn/unpack-trees-checkout-m-carry-deletion should do the same). * so/rebase-doc (2014-08-12) 1 commit - Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op May need description on what
