Re: What's cooking in git.git (Aug 2014, #02; Fri, 8)
On Fri, Aug 08, 2014 at 03:18:11PM -0700, Junio C Hamano wrote: * cb/mergetool-difftool (2014-07-21) 2 commits - difftool: don't assume that default sh is sane - mergetool: don't require a work tree for --tool-help Update the way the difftool --help shows the help message that is shared with the mergetool to reduce one shell dependency. Will merge to 'next'. Can you hold off on merging this? I think I want to have another go at making this neater. Specifically, --tool-help doesn't need a working tree but I hadn't spotted that it still requires a GIT_DIR / --git-dir when it really shouldn't. -- 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, #02; Fri, 8)
On Fri, Aug 08, 2014 at 03:18:11PM -0700, Junio C Hamano wrote: * jk/pack-bitmap (2014-08-04) 1 commit - pack-bitmap: do not use gcc packed attribute Will merge to 'next'. You may want to hold off on merging this; I hope Karsten will re-roll his neater replacement patch next week, which would replace it completely. -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
What's cooking in git.git (Aug 2014, #02; Fri, 8)
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The second release candidate snapshot is out. Hopefully after a week of a calm pre-release bugfix-only period, we can do the 2.1 final late next week. 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 -- [Graduated to master] * ta/doc-config (2014-07-30) 1 commit (merged to 'next' on 2014-07-31 at ec577fa) + add documentation for writing config files * tf/maint-doc-push (2014-07-31) 1 commit (merged to 'next' on 2014-07-31 at 6a8ef70) + git-push: fix link in man page -- [New Topics] * tf/imap-send-create (2014-08-01) 3 commits - SQUASH??? varargs form of issue-imap-cmd is no longer used - imap-send: create target mailbox if it is missing - imap-send: clarify CRAM-MD5 vs LOGIN documentation Will merge to 'next' after dealing with the SQUASH??? fix-up. * bc/archive-pax-header-mode (2014-08-04) 1 commit - archive: honor tar.umask even for pax headers Implementations of tar that do not understand an extended pax header would extract the contents of it in a regular file; make sure the permission bits of this file follows the same tar.umask configuration setting. Will merge to 'next'. * bc/imap-send-doc (2014-08-05) 1 commit - imap-send doc: omit confusing to use imap-send modifier Will merge to 'next'. * jc/apply-ws-prefix (2014-08-07) 3 commits - apply: omit ws check for excluded paths - apply: hoist use_patch() helper for path exclusion up - apply: use the right attribute for paths in non-Git patches Applying a patch not generated by Git in a subdirectory used to check the whitespace breakage using the attributes for incorrect paths. Also whitespace checks were performed even for paths excluded via git apply --exclude=path mechanism. Will merge to 'next'. * jk/command-line-config-empty-string (2014-08-05) 1 commit - config: teach git -c to recognize an empty string git -c section.var command and git -c section.var= command should pass the configuration differently (the former should be a boolean true, the latter should be an empty string). Will merge to 'next'. * jk/pack-bitmap (2014-08-04) 1 commit - pack-bitmap: do not use gcc packed attribute Will merge to 'next'. * jk/pretty-empty-format (2014-07-30) 3 commits - pretty: make empty userformats truly empty - pretty: treat --format= as an empty userformat - revision: drop useless string offset when parsing --pretty git log --pretty/format= with an empty format string did not mean the more obvious No output whatsoever but Use default format, which was counterintuitive. Will merge to 'next'. * la/init-doc (2014-08-08) 7 commits - Documentation: git-init: flesh out example - Documentation: git-init: template directory: reword and cross-reference - Documentation: git-init: reword parenthetical statements - Documentation: git-init: --separate-git-dir: clarify - Documentation: git-init: template directory: reword - Documentation: git-init: list items facelift - Documentation: git-init: typographical fixes Will merge to 'next'. * lf/bundle-exclusion (2014-08-07) 1 commit - bundle: fix exclusion of annotated tags Will merge to 'next'. * mm/log-branch-desc-plug-leak (2014-08-07) 1 commit - builtin/log.c: fix minor memory leak Will merge to 'next'. * ta/config-set-1 (2014-08-07) 8 commits - add tests for `git_config_get_string_const()` - add a test for semantic errors in config files - rewrite git_config() to use the config-set API - config: add `git_die_config()` to the config-set API - change `git_config()` return value to void - add line number and file name info to `config_set` - config.c: fix accuracy of line number in errors - config.c: mark error and warnings strings for translation (this branch is used by ta/config-set-2; uses ta/config-set.) * ta/config-set-2 (2014-08-07) 11 commits - branch.c: replace `git_config()` with `git_config_get_string() - alias.c: replace `git_config()` with `git_config_get_string()` - imap-send.c: replace `git_config()` with `git_config_get_*()` family - pager.c: replace `git_config()` with `git_config_get_value()` - builtin/gc.c: replace `git_config()` with `git_config_get_*()` family - rerere.c: replace `git_config()` with `git_config_get_*()` family - fetchpack.c: replace `git_config()` with `git_config_get_*()` family - archive.c: replace `git_config()` with `git_config_get_bool()` family - read-cache.c: replace `git_config()` with `git_config_get_*()` family - http-backend.c: replace `git_config()` with `git_config_get_bool()` family - daemon.c: replace `git_config()` with `git_config_get_bool()` family (this branch uses ta/config-set and
Re: What's cooking in git.git (Aug 2014, #02; Fri, 8)
On Sat, Aug 9, 2014 at 5:18 AM, Junio C Hamano gits...@pobox.com wrote: * nd/lock-paths-absolute (2014-08-01) 3 commits - lockfile.c: store absolute path - lockfile.c: remove PATH_MAX limit in resolve_symlink() - lockfile.c: remove PATH_MAX limitation (except in resolve_symlink) (this branch uses rs/strbuf-getcwd.) Will merge to 'next'. You may want to hold this back for a while until Michael has a chance to look and decides what to do with it and his mh/lockfile series. -- Duy -- 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
