From 57b47803292f83ee0715ab91ae6b805a5fee95fc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 11 Mar 2014 15:10:36 -0700 Subject: [PATCH] What's cooking (2014/05 #02) --- whats-cooking.txt | 1171 ++++++++++++++++++++++------------------------------- 1 file changed, 495 insertions(+), 676 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 5fa073a885..0df702e116 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,18 +1,19 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Mar 2014, #01; Tue, 4) -X-master-at: 2de34784dfcbb4fe0febe9ab98e0b99138040109 -X-next-at: d464cb7a99e56a69dc347cdeb1620023efc8669a +Subject: What's cooking in git.git (Mar 2014, #02; Tue, 11) +X-master-at: 384364b5f1aa0c3b7610a1b3c9eca2c210e61b41 +X-next-at: d838d6f000d8078a1e28d6780f767cb925fb2632 -What's cooking in git.git (Mar 2014, #01; Tue, 4) +What's cooking in git.git (Mar 2014, #02; Tue, 11) -------------------------------------------------- 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 handful of "GSoC warm-up microprojects" have been queued on 'pu'. -Thanks for reviewing them. +Topics that have been cooking in 'next' for 2.0 have been merged to +'master', which means we are committed to make the next one a big +release. Kind of scary, isn't it? You can find the changes described here in the integration branches of the repositories listed at @@ -22,489 +23,249 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* al/docs (2014-02-11) 4 commits - (merged to 'next' on 2014-02-25 at 0c1a734) - + docs/git-blame: explain more clearly the example pickaxe use - + docs/git-clone: clarify use of --no-hardlinks option - + docs/git-remote: capitalize first word of initial blurb - + docs/merge-strategies: remove hyphen from mis-merges - - Originally merged to 'next' on 2014-02-13 - - A handful of documentation updates, all trivially harmless. - - -* bc/gpg-sign-everywhere (2014-02-11) 9 commits - (merged to 'next' on 2014-02-25 at 7db014c) - + pull: add the --gpg-sign option. - + rebase: add the --gpg-sign option - + rebase: parse options in stuck-long mode - + rebase: don't try to match -M option - + rebase: remove useless arguments check - + am: add the --gpg-sign option - + am: parse options in stuck-long mode - + git-sh-setup.sh: add variable to use the stuck-long mode - + cherry-pick, revert: add the --gpg-sign option - - Originally merged to 'next' on 2014-02-13 - - Teach "--gpg-sign" option to many commands that create commits. - - -* bk/refresh-missing-ok-in-merge-recursive (2014-02-24) 4 commits - (merged to 'next' on 2014-02-25 at 2651cb0) - + merge-recursive.c: tolerate missing files while refreshing index - + read-cache.c: extend make_cache_entry refresh flag with options - + read-cache.c: refactor --ignore-missing implementation - + t3030-merge-recursive: test known breakage with empty work tree - - Originally merged to 'next' on 2014-01-29 - - Allow "merge-recursive" to work in an empty (temporary) working - tree again when there are renames involved, correcting an old - regression in 1.7.7 era. - - -* bs/stdio-undef-before-redef (2014-01-31) 1 commit - (merged to 'next' on 2014-02-25 at 77c4b5f) - + git-compat-util.h: #undef (v)snprintf before #define them - - Originally merged to 'next' on 2014-01-31 - - When we replace broken macros from stdio.h in git-compat-util.h, - #undef them to avoid re-definition warnings from the C - preprocessor. - - -* da/pull-ff-configuration (2014-01-15) 2 commits - (merged to 'next' on 2014-02-25 at b9e4f61) - + pull: add --ff-only to the help text - + pull: add pull.ff configuration +* cc/starts-n-ends-with-endgame (2013-12-05) 1 commit + (merged to 'next' on 2014-02-25 at 473e143) + + strbuf: remove prefixcmp() and suffixcmp() - Originally merged to 'next' on 2014-01-22 + Originally merged to 'next' on 2014-01-07 - "git pull" learned to pay attention to pull.ff configuration - variable. + Endgame for the cc/starts-n-ends-with topic; this needs to be + evil-merged with other topics that introduce new uses of + prefix/suffix-cmp functions. -* dk/blame-janitorial (2014-02-25) 5 commits - (merged to 'next' on 2014-02-25 at d5faeb2) - + builtin/blame.c::find_copy_in_blob: no need to scan for region end - + blame.c: prepare_lines should not call xrealloc for every line - + builtin/blame.c::prepare_lines: fix allocation size of sb->lineno - + builtin/blame.c: eliminate same_suspect() - + builtin/blame.c: struct blame_entry does not need a prev link +* gj/push-more-verbose-advice (2013-11-13) 1 commit + (merged to 'next' on 2014-02-25 at 1cd10b0) + + push: switch default from "matching" to "simple" - Originally merged to 'next' on 2014-02-13 + Originally merged to 'next' on 2013-11-21 - Code clean-up. + Explain 'simple' and 'matching' in "git push" advice message; the + topmost patch is a rebase of jc/push-2.0-default-to-simple on top + of it. -* ds/rev-parse-required-args (2014-01-28) 1 commit - (merged to 'next' on 2014-02-25 at bba6e79) - + rev-parse: check i before using argv[i] against argc - - Originally merged to 'next' on 2014-01-31 - - "git rev-parse --default" without the required option argument did - not diagnose it as an error. +* jc/add-2.0-ignore-removal (2013-04-22) 1 commit + (merged to 'next' on 2014-02-25 at a0d018a) + + git add ... defaults to "-A" + Originally merged to 'next' on 2013-12-06 -* ep/varscope (2014-01-31) 7 commits - (merged to 'next' on 2014-02-25 at e967c7e) - + builtin/gc.c: reduce scope of variables - + builtin/fetch.c: reduce scope of variable - + builtin/commit.c: reduce scope of variables - + builtin/clean.c: reduce scope of variable - + builtin/blame.c: reduce scope of variables - + builtin/apply.c: reduce scope of variables - + bisect.c: reduce scope of variable + Updated endgame for "git add " that defaults to "--all" + aka "--no-ignore-removal". - Originally merged to 'next' on 2014-01-31 - - Shrink lifetime of variables by moving their definitions to an - inner scope where appropriate. +* jc/core-checkstat-2.0 (2013-05-06) 1 commit + (merged to 'next' on 2014-02-25 at 62f6aeb) + + core.statinfo: remove as promised in Git 2.0 -* jk/config-path-include-fix (2014-01-28) 2 commits - (merged to 'next' on 2014-02-25 at 3604f75) - + handle_path_include: don't look at NULL value - + expand_user_path: do not look at NULL path + Originally merged to 'next' on 2013-12-06 - Originally merged to 'next' on 2014-01-31 - - include.path variable (or any variable that expects a path that can - use ~username expansion) in the configuration file is not a - boolean, but the code failed to check it. - - -* jk/pack-bitmap (2014-02-12) 26 commits - (merged to 'next' on 2014-02-25 at 5f65d26) - + ewah: unconditionally ntohll ewah data - + ewah: support platforms that require aligned reads - + read-cache: use get_be32 instead of hand-rolled ntoh_l - + block-sha1: factor out get_be and put_be wrappers - + do not discard revindex when re-preparing packfiles - + pack-bitmap: implement optional name_hash cache - + t/perf: add tests for pack bitmaps - + t: add basic bitmap functionality tests - + count-objects: recognize .bitmap in garbage-checking - + repack: consider bitmaps when performing repacks - + repack: handle optional files created by pack-objects - + repack: turn exts array into array-of-struct - + repack: stop using magic number for ARRAY_SIZE(exts) - + pack-objects: implement bitmap writing - + rev-list: add bitmap mode to speed up object lists - + pack-objects: use bitmaps when packing objects - + pack-objects: split add_object_entry - + pack-bitmap: add support for bitmap indexes - + documentation: add documentation for the bitmap format - + ewah: compressed bitmap implementation - + compat: add endianness helpers - + sha1_file: export `git_open_noatime` - + revision: allow setting custom limiter function - + pack-objects: factor out name_hash - + pack-objects: refactor the packing list - + revindex: export new APIs - (this branch is used by jk/repack-pack-keep-objects.) - - Originally merged to 'next' on 2014-02-13 - - Borrow the bitmap index into packfiles from JGit to speed up - enumeration of objects involved in a commit range without having to - fully traverse the history. - - -* jk/test-ports (2014-02-10) 2 commits - (merged to 'next' on 2014-02-25 at 86ce2e4) - + tests: auto-set git-daemon port - + tests: auto-set LIB_HTTPD_PORT from test name - (this branch is tangled with nd/http-fetch-shallow-fix.) - Originally merged to 'next' on 2014-02-13 - - Avoid having to assign port number to be used in tests manually. - - -* kb/fast-hashmap (2014-02-24) 18 commits - (merged to 'next' on 2014-02-25 at 88a98e6) - + name-hash: retire unused index_name_exists() - + hashmap.h: use 'unsigned int' for hash-codes everywhere - + test-hashmap.c: drop unnecessary #includes - + .gitignore: test-hashmap is a generated file - + read-cache.c: fix memory leaks caused by removed cache entries - + builtin/update-index.c: cleanup update_one - + fix 'git update-index --verbose --again' output - + remove old hash.[ch] implementation - + name-hash.c: remove cache entries instead of marking them CE_UNHASHED - + name-hash.c: use new hash map implementation for cache entries - + name-hash.c: remove unreferenced directory entries - + name-hash.c: use new hash map implementation for directories - + diffcore-rename.c: use new hash map implementation - + diffcore-rename.c: simplify finding exact renames - + diffcore-rename.c: move code around to prepare for the next patch - + buitin/describe.c: use new hash map implementation - + add a hashtable implementation that supports O(1) removal - + submodule: don't access the .gitmodules cache entry after removing it - (this branch is used by kb/fast-hashmap-pack-struct.) - - Originally merged to 'next' on 2014-01-03 - - Improvements to our hash table to get it to meet the needs of the - msysgit fscache project, with some nice performance improvements. - - -* ks/tree-diff-walk (2014-02-24) 5 commits - (merged to 'next' on 2014-02-25 at 17e594f) - + tree-walk: finally switch over tree descriptors to contain a pre-parsed entry - + revision: convert to using diff_tree_sha1() - + line-log: convert to using diff_tree_sha1() - + tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old=NULL - + tree-diff: allow diff_tree_sha1 to accept NULL sha1 - (this branch is used by ks/combine-diff, ks/tree-diff-more and ks/tree-diff-nway.) - - Originally merged to 'next' on 2014-02-06 - - -* mw/symlinks (2014-02-04) 6 commits - (merged to 'next' on 2014-02-25 at 15dc036) - + setup: don't dereference in-tree symlinks for absolute paths - + setup: add abspath_part_inside_repo() function - + t0060: add tests for prefix_path when path begins with work tree - + t0060: add test for prefix_path when path == work tree - + t0060: add test for prefix_path on symlinks via absolute paths - + t3004: add test for ls-files on symlinks via absolute paths - - Originally merged to 'next' on 2014-02-06 - - All subcommands that take pathspecs mishandled an in-tree symbolic - link when given it as a full path from the root (which arguably is - a sick way to use pathspecs). "git ls-files -s $(pwd)/RelNotes" in - our tree is an easy reproduction recipe. - - -* nd/diff-quiet-stat-dirty (2014-02-24) 2 commits - (merged to 'next' on 2014-02-25 at 7cad1d3) - + diff: do not quit early on stat-dirty files - + diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later - - Originally merged to 'next' on 2014-01-31 - - "git diff --quiet -- pathspec1 pathspec2" sometimes did not return - correct status value. - - -* nd/http-fetch-shallow-fix (2014-02-13) 7 commits - (merged to 'next' on 2014-02-25 at ad4e9c9) - + t5537: move http tests out to t5539 - + fetch-pack: fix deepen shallow over smart http with no-done cap - + protocol-capabilities.txt: document no-done - + protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txt - + pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done' - + test: rename http fetch and push test files - + tests: auto-set LIB_HTTPD_PORT from test name - (this branch is tangled with jk/test-ports.) +* jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit + (merged to 'next' on 2014-02-25 at ccfff88) + + diff: remove "diff-files -q" in a version of Git in a distant future - Originally merged to 'next' on 2014-02-13 + Originally merged to 'next' on 2013-12-06 - Attempting to deepen a shallow repository by fetching over smart - HTTP transport failed in the protocol exchange, when no-done - extension was used. The fetching side waited for the list of - shallow boundary commits after the sending end stopped talking to - it. + Remove deprecated "-q" option "git diff-files". -* nd/reset-intent-to-add (2014-02-05) 1 commit - (merged to 'next' on 2014-02-25 at 0c48245) - + reset: support "--mixed --intent-to-add" mode +* jc/push-2.0-default-to-simple (2013-06-18) 1 commit + (merged to 'next' on 2014-02-25 at 1f0e178) + + push: switch default from "matching" to "simple" - Originally merged to 'next' on 2014-02-07 + Originally merged to 'next' on 2013-12-06 -* nd/submodule-pathspec-ending-with-slash (2014-02-24) 8 commits - (merged to 'next' on 2014-02-25 at 954b7a2) - + clean: use cache_name_is_other() - + clean: replace match_pathspec() with dir_path_match() - + pathspec: pass directory indicator to match_pathspec_item() - + match_pathspec: match pathspec "foo/" against directory "foo" - + dir.c: prepare match_pathspec_item for taking more flags - + pathspec: rename match_pathspec_depth() to match_pathspec() - + pathspec: convert some match_pathspec_depth() to dir_path_match() - + pathspec: convert some match_pathspec_depth() to ce_path_match() +* jk/run-network-tests-by-default (2014-02-14) 1 commit + (merged to 'next' on 2014-02-25 at 62a8ad0) + + tests: turn on network daemon tests by default - Originally merged to 'next' on 2014-01-31 + Originally merged to 'next' on 2014-02-20 - Allow "git cmd path/", when the 'path' is where a submodule is - bound to the top-level working tree, to match 'path', despite the - extra and unnecessary trailing slash. + Teach "make test" to run networking tests when possible by default. -* nd/test-rename-reset (2014-02-04) 1 commit - (merged to 'next' on 2014-02-25 at 7b25711) - + t7101, t7014: rename test files to indicate what that file is for +* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit + (merged to 'next' on 2014-02-25 at 9e5c0d2) + + git add: -u/-A now affects the entire working tree - Originally merged to 'next' on 2014-02-06 + Originally merged to 'next' on 2013-12-06 -* nv/commit-gpgsign-config (2014-02-24) 3 commits - (merged to 'next' on 2014-02-25 at 0baefa2) - + test the commit.gpgsign config option - + commit-tree: add and document --no-gpg-sign - + commit-tree: add the commit.gpgsign option to sign all commits +* ks/combine-diff (2014-02-24) 6 commits + (merged to 'next' on 2014-02-25 at 69e5a87) + + tests: add checking that combine-diff emits only correct paths + + combine-diff: simplify intersect_paths() further + + combine-diff: combine_diff_path.len is not needed anymore + + combine-diff: optimize combine_diff_path sets intersection + + diff test: add tests for combine-diff with orderfile + + diffcore-order: export generic ordering interface + (this branch is used by ks/tree-diff-nway.) - Originally merged to 'next' on 2014-01-03 + Originally merged to 'next' on 2014-02-20 - Introduce commit.gpgsign configuration variable to force every - commit to be GPG signed. The variable cannot be overriden from the - command line of some of the commands that create commits except for - "git commit" and "git commit-tree", but I am not convinced that it - is a good idea to sprinkle support for --no-gpg-sign everywhere, - which in turn means that this configuration variable may not be - such a good idea. + Teach combine-diff to honour the path-output-order imposed by + diffcore-order, and optimize how matching paths are found in + the N-way diffs made with parents. -* wk/submodule-on-branch (2014-02-24) 4 commits - (merged to 'next' on 2014-02-25 at c6d9fef) - + Documentation: describe 'submodule update --remote' use case - + submodule: explicit local branch creation in module_clone - + submodule: document module_clone arguments in comments - + submodule: make 'checkout' update_module mode more explicit +* nd/daemonize-gc (2014-02-10) 2 commits + (merged to 'next' on 2014-02-25 at f592335) + + gc: config option for running --auto in background + + daemon: move daemonize() to libgit.a - Originally merged to 'next' on 2014-02-06 + Originally merged to 'next' on 2014-02-20 - Make sure 'submodule update' modes that do not detach HEADs can - be used more pleasantly by checking out a concrete branch when - cloning them to prime the well. + Allow running "gc --auto" in the background. -------------------------------------------------- [New Topics] -* jc/stash-pop-not-popped (2014-02-26) 1 commit - - stash pop: mention we did not drop the stash upon failing to apply - - "stash pop", upon failing to apply the stash, refrains from - discarding the stash to avoid information loss. Be more explicit - in the error message. - - The wording may want to get a bit more bikeshedding, but otherwise - it should be OK for 'next'. - +* jk/detect-push-typo-early (2014-03-05) 3 commits + - push: detect local refspec errors early + - match_explicit_lhs: allow a "verify only" mode + - match_explicit: hoist refspec lhs checks into their own function -* bg/install-branch-config-skip-prefix (2014-02-28) 2 commits - - branch: use skip_prefix() in install_branch_config() - - t3200-branch: test setting branch as own upstream + Catch "git push $there no-such-branch" early. - The new test probably wants the longer-term effect of the rejected - operation, not just the rejection warning message. + Will merge to 'next'. -* cn/fetch-prune-overlapping-destination (2014-02-28) 2 commits - - fetch: handle overlaping refspecs on --prune - - fetch: add a failing test for prunning with overlapping refspecs +* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit + - diff: simplify cpp funcname regex - Protect refs in a hierarchy that can come from more than one remote - hierarcies from incorrect removal by "git fetch --prune". + Has the discussion settled on this? - Comments? +* jk/doc-deprecate-grafts (2014-03-05) 1 commit + - docs: mark info/grafts as outdated -* dd/find-graft-with-sha1-pos (2014-02-27) 1 commit - - commit.c: use the generic "sha1_pos" function for lookup - - Replace a hand-rolled binary search with a call to our generic - binary search helper function. - + Will merge to 'next'. -* dd/use-alloc-grow (2014-03-03) 14 commits - - sha1_file.c: use ALLOC_GROW() in pretend_sha1_file() - - read-cache.c: use ALLOC_GROW() in add_index_entry() - - builtin/mktree.c: use ALLOC_GROW() in append_to_tree() - - attr.c: use ALLOC_GROW() in handle_attr_line() - - dir.c: use ALLOC_GROW() in create_simplify() - - reflog-walk.c: use ALLOC_GROW() - - replace_object.c: use ALLOC_GROW() in register_replace_object() - - patch-ids.c: use ALLOC_GROW() in add_commit() - - diffcore-rename.c: use ALLOC_GROW() - - diff.c: use ALLOC_GROW() - - commit.c: use ALLOC_GROW() in register_commit_graft() - - cache-tree.c: use ALLOC_GROW() in find_subtree() - - bundle.c: use ALLOC_GROW() in add_to_ref_list() - - builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path() - Replace open-coded reallocation with ALLOC_GROW() macro. +* rm/strchrnul-not-strlen (2014-03-10) 1 commit + - use strchrnul() in place of strchr() and strlen() + Will merge to 'next'. -* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit - - skip_prefix(): scan prefix only once - Updaste implementation of skip_prefix() to scan only once; given - that most "prefix" arguments to the inline function are constant - strings whose strlen() can be determined at the compile time, this - might actually make things worse with a compiler with sufficient - intelligence. +* sh/use-hashcpy (2014-03-06) 1 commit + - Use hashcpy() when copying object names + Will merge to 'next'. -* jk/doc-coding-guideline (2014-02-28) 1 commit - - CodingGuidelines: mention C whitespace rules - Elaborate on a style niggle that has been part of "mimic existing - code". +* jc/no-need-for-env-in-sh-scripts (2014-03-06) 1 commit + - *.sh: drop useless use of "env" Will merge to 'next'. -* jk/shallow-update-fix (2014-02-27) 2 commits - - shallow: automatically clean up shallow tempfiles - - shallow: use stat_validity to check for up-to-date file - - Serving objects from a shallow repository needs to write a - temporary file to be used, but the serving upload-pack may not have - write access to the repository which is meant to be read-only. - +* jc/tag-contains-with (2014-03-07) 1 commit + - tag: grok "--with" as synonym to "--contains" -* jl/doc-submodule-update-checkout (2014-02-28) 1 commit - - submodule update: consistently document the '--checkout' option + Will merge to 'next'. - Add missing documentation for "submodule update --checkout". - Will merge to 'next'. +* bp/commit-p-editor (2014-03-11) 8 commits + - run-command: mark run_hook_with_custom_index as deprecated + - merge hook tests: fix and update tests + - merge: fix GIT_EDITOR override for commit hook + - commit: fix patch hunk editing with "commit -p -m" + - SQUASH??? + - test patch hunk editing with "commit -p -m" + - merge hook tests: use 'test_must_fail' instead of '!' + - merge hook tests: fix missing '&&' in test -* jn/bisect-coding-style (2014-03-03) 1 commit - - git-bisect.sh: fix a few style issues +* cp/am-patch-format-doc (2014-03-11) 1 commit + - Documentation/git-am: Document supported --patch-format options Will merge to 'next'. -* jn/branch-lift-unnecessary-name-length-limit (2014-02-28) 1 commit - - branch.c: delete size check of newly tracked branch names +* dm/configure-iconv-locale-charset (2014-03-11) 1 commit + - configure.ac: link with -liconv for locale_charset() -* mh/simplify-cache-tree-find (2014-03-04) 2 commits - - SQUASH??? use strchrnul - - cache_tree_find(): remove redundant checks - +* jk/clean-d-pathspec (2014-03-11) 2 commits + - clean: simplify dir/not-dir logic + - clean: respect pathspecs with "-d" -* nd/strbuf-inline-styles (2014-03-03) 1 commit - - strbuf: style fix -- top opening bracket on a separate line + "git clean -d pathspec" did not use pathspec correctly. - Will merge to 'next'. + Will merge to 'next' and later down to 'maint'. -* nd/tag-version-sort (2014-02-27) 1 commit - - tag: support --sort= +* jk/mv-submodules-fix (2014-03-11) 2 commits + - mv: prevent mismatched data when ignoring errors. + - builtin/mv: fix out of bounds write - Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output. + Needs tests. -* rt/help-pretty-prints-cmd-names (2014-02-28) 1 commit - - help.c: rename function "pretty_print_string_list" +* nd/upload-pack-shallow (2014-03-11) 1 commit + - upload-pack: send shallow info over stdin to pack-objects Will merge to 'next'. -* sg/archive-restrict-remote (2014-02-28) 2 commits - - add uploadarchive.allowUnreachable option - - docs: clarify remote restrictions for git-upload-archive +* rs/grep-h-c (2014-03-11) 2 commits + - grep: support -h (no header) with --count + - t7810: add missing variables to tests in loop - Allow loosening remote "git archive" invocation security check that - refuses to serve tree-ish not at the tip of any ref. + "git grep" learns to handle combination of "-h (no header)" and "-c + (counts)". Will merge to 'next'. +-------------------------------------------------- +[Stalled] +* ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit + - remote-hg: do not fail on invalid bookmarks -* sh/finish-tmp-packfile (2014-03-03) 2 commits - - finish_tmp_packfile():use strbuf for pathname construction - - Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile - (this branch uses sh/write-pack-file-warning-message-fix.) - - -* sh/write-pack-file-warning-message-fix (2014-03-03) 1 commit - - write_pack_file: use correct variable in diagnostic - (this branch is used by sh/finish-tmp-packfile.) - - A warning from "git pack-objects" were generated by referring to an - incorrect variable when forming the filename that we had trouble - with. + Reported to break tests ($gmane/240005) + Expecting a reroll. - Will merge to 'next'. +* jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits + - get_sha1: drop object/refname ambiguity flag + - get_sha1: speed up ambiguous 40-hex test + - FIXUP: teach DO_FOR_EACH_NO_RECURSE to prime_ref_dir() + - refs: teach for_each_ref a flag to avoid recursion + - cat-file: fix a minor memory leak in batch_objects + - cat-file: refactor error handling of batch_objects -* sr/add--interactive-term-readkey (2014-03-03) 2 commits - - git-add--interactive: warn if module for interactive.singlekey is missing - - git-config: document interactive.singlekey requires Term::ReadKey + Expecting a reroll. - Will merge to 'next'. +* jk/makefile (2014-02-05) 16 commits + - FIXUP + - move LESS/LV pager environment to Makefile + - Makefile: teach scripts to include make variables + - FIXUP + - Makefile: auto-build C strings from make variables + - Makefile: drop *_SQ variables + - FIXUP + - Makefile: add c-quote helper function + - Makefile: introduce sq function for shell-quoting + - Makefile: always create files via make-var + - Makefile: store GIT-* sentinel files in MAKE/ + - Makefile: prefer printf to echo for GIT-* + - Makefile: use tempfile/mv strategy for GIT-* + - Makefile: introduce make-var helper function + - Makefile: fix git-instaweb dependency on gitweb + - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS -* ta/parse-commit-with-skip-prefix (2014-03-04) 1 commit - - commit.c: use skip_prefix() instead of starts_with() + Simplify the Makefile rules and macros that exist primarily for + quoting purposes, and make it easier to robustly express the + dependency rules. - Will merge to 'next'. + Expecting a reroll. --------------------------------------------------- -[Stalled] * kb/fast-hashmap-pack-struct (2014-02-24) 1 commit - hashmap.h: make sure map entries are tightly packed @@ -704,79 +465,274 @@ of the repositories listed at - pack-refs.c: Add missing call to git_config() - show-ref.c: Add missing call to git_config() - The changes themselves are probably good, but it is unclear what - basic setting needs to be read for which exact operation. + The changes themselves are probably good, but it is unclear what + basic setting needs to be read for which exact operation. + + Will discard, tired of waiting for clarification. + $gmane/228294 + + +* jc/format-patch (2013-04-22) 2 commits + - format-patch: --inline-single + - format-patch: rename "no_inline" field + + A new option to send a single patch to the standard output to be + appended at the bottom of a message. I personally have no need for + this, but it was easy enough to cobble together. Tests, docs and + stripping out more MIMEy stuff are left as exercises to interested + parties. + + +* jk/gitweb-utf8 (2013-04-08) 4 commits + - gitweb: Fix broken blob action parameters on blob/commitdiff pages + - gitweb: Don't append ';js=(0|1)' to external links + - gitweb: Make feed title valid utf8 + - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch + + Various fixes to gitweb. + + Drew Northup volunteered to take a look into this ($gmane/226216) + but nothing seems to have happened since then. + + Will discard. + + +* jc/show-branch (2013-06-07) 5 commits + - show-branch: use commit slab to represent bitflags of arbitrary width + - show-branch.c: remove "all_mask" + - show-branch.c: abstract out "flags" operation + - show-branch.c: lift all_mask/all_revs to a global static + - show-branch.c: update comment style + + Waiting for the final step to lift the hard-limit before sending it out. + +-------------------------------------------------- +[Cooking] + +* jc/stash-pop-not-popped (2014-02-26) 1 commit + - stash pop: mention we did not drop the stash upon failing to apply + + "stash pop", upon failing to apply the stash, refrains from + discarding the stash to avoid information loss. Be more explicit + in the error message. + + The wording may want to get a bit more bikeshedding, but otherwise + it should be OK for 'next'. + + +* bg/install-branch-config-skip-prefix (2014-03-06) 2 commits + - branch: use skip_prefix() in install_branch_config() + - t3200-branch: test setting branch as own upstream + + Will merge to 'next'. + + +* cn/fetch-prune-overlapping-destination (2014-02-28) 2 commits + - fetch: handle overlaping refspecs on --prune + - fetch: add a failing test for prunning with overlapping refspecs + + Protect refs in a hierarchy that can come from more than one remote + hierarcies from incorrect removal by "git fetch --prune". + + Comments? + + +* dd/find-graft-with-sha1-pos (2014-02-27) 1 commit + - commit.c: use the generic "sha1_pos" function for lookup + + Replace a hand-rolled binary search with a call to our generic + binary search helper function. + + Will merge to 'next'. + + +* dd/use-alloc-grow (2014-03-03) 14 commits + - sha1_file.c: use ALLOC_GROW() in pretend_sha1_file() + - read-cache.c: use ALLOC_GROW() in add_index_entry() + - builtin/mktree.c: use ALLOC_GROW() in append_to_tree() + - attr.c: use ALLOC_GROW() in handle_attr_line() + - dir.c: use ALLOC_GROW() in create_simplify() + - reflog-walk.c: use ALLOC_GROW() + - replace_object.c: use ALLOC_GROW() in register_replace_object() + - patch-ids.c: use ALLOC_GROW() in add_commit() + - diffcore-rename.c: use ALLOC_GROW() + - diff.c: use ALLOC_GROW() + - commit.c: use ALLOC_GROW() in register_commit_graft() + - cache-tree.c: use ALLOC_GROW() in find_subtree() + - bundle.c: use ALLOC_GROW() in add_to_ref_list() + - builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path() + + Replace open-coded reallocation with ALLOC_GROW() macro. + + Will merge to 'next'. + + +* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit + - skip_prefix(): scan prefix only once + + Updaste implementation of skip_prefix() to scan only once; given + that most "prefix" arguments to the inline function are constant + strings whose strlen() can be determined at the compile time, this + might actually make things worse with a compiler with sufficient + intelligence. + + +* jk/doc-coding-guideline (2014-02-28) 1 commit + (merged to 'next' on 2014-03-06 at c33101d) + + CodingGuidelines: mention C whitespace rules + + Elaborate on a style niggle that has been part of "mimic existing + code". + + Will merge to 'master'. + + +* jk/shallow-update-fix (2014-02-27) 2 commits + - shallow: automatically clean up shallow tempfiles + - shallow: use stat_validity to check for up-to-date file + + Serving objects from a shallow repository needs to write a + temporary file to be used, but the serving upload-pack may not have + write access to the repository which is meant to be read-only. + + Will merge to 'next'. + + +* jl/doc-submodule-update-checkout (2014-02-28) 1 commit + (merged to 'next' on 2014-03-06 at 8cdf5cb) + + submodule update: consistently document the '--checkout' option + + Add missing documentation for "submodule update --checkout". + + Will merge to 'master'. + + +* jn/bisect-coding-style (2014-03-03) 1 commit + (merged to 'next' on 2014-03-06 at e1de2a5) + + git-bisect.sh: fix a few style issues + + Will merge to 'master'. + + +* jn/branch-lift-unnecessary-name-length-limit (2014-03-05) 1 commit + - branch.c: delete size check of newly tracked branch names + + Will merge to 'next'. + + +* mh/simplify-cache-tree-find (2014-03-05) 6 commits + - cache_tree_find(): use path variable when passing over slashes + - cache_tree_find(): remove early return + - cache_tree_find(): remove redundant check + - cache_tree_find(): fix comment formatting + - cache_tree_find(): find the end of path component using strchrnul() + - cache_tree_find(): remove redundant checks + + Will merge to 'next'. + + +* nd/strbuf-inline-styles (2014-03-03) 1 commit + (merged to 'next' on 2014-03-06 at 70b5e56) + + strbuf: style fix -- top opening bracket on a separate line + + Will merge to 'master'. + + +* nd/tag-version-sort (2014-02-27) 1 commit + - tag: support --sort= + + Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output. + + Will merge to 'next'. + + +* rt/help-pretty-prints-cmd-names (2014-02-28) 1 commit + (merged to 'next' on 2014-03-06 at fc607dc) + + help.c: rename function "pretty_print_string_list" + + Will merge to 'master'. + + +* sg/archive-restrict-remote (2014-02-28) 2 commits + (merged to 'next' on 2014-03-06 at 5fe8998) + + add uploadarchive.allowUnreachable option + + docs: clarify remote restrictions for git-upload-archive + + Allow loosening remote "git archive" invocation security check that + refuses to serve tree-ish not at the tip of any ref. + + Will merge to 'master'. - Will discard, tired of waiting for clarification. - $gmane/228294 +* sh/finish-tmp-packfile (2014-03-03) 2 commits + - finish_tmp_packfile():use strbuf for pathname construction + - Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile + (this branch uses sh/write-pack-file-warning-message-fix.) -* jc/format-patch (2013-04-22) 2 commits - - format-patch: --inline-single - - format-patch: rename "no_inline" field + Will merge to 'next'. - A new option to send a single patch to the standard output to be - appended at the bottom of a message. I personally have no need for - this, but it was easy enough to cobble together. Tests, docs and - stripping out more MIMEy stuff are left as exercises to interested - parties. +* sh/write-pack-file-warning-message-fix (2014-03-03) 1 commit + (merged to 'next' on 2014-03-06 at 1470b0a) + + write_pack_file: use correct variable in diagnostic + (this branch is used by sh/finish-tmp-packfile.) -* jk/gitweb-utf8 (2013-04-08) 4 commits - - gitweb: Fix broken blob action parameters on blob/commitdiff pages - - gitweb: Don't append ';js=(0|1)' to external links - - gitweb: Make feed title valid utf8 - - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch + A warning from "git pack-objects" were generated by referring to an + incorrect variable when forming the filename that we had trouble + with. - Various fixes to gitweb. + Will merge to 'master'. - Drew Northup volunteered to take a look into this ($gmane/226216) - but nothing seems to have happened since then. - Will discard. +* sr/add--interactive-term-readkey (2014-03-03) 2 commits + (merged to 'next' on 2014-03-06 at 9ca7af8) + + git-add--interactive: warn if module for interactive.singlekey is missing + + git-config: document interactive.singlekey requires Term::ReadKey + Will merge to 'master'. -* jc/show-branch (2013-06-07) 5 commits - - show-branch: use commit slab to represent bitflags of arbitrary width - - show-branch.c: remove "all_mask" - - show-branch.c: abstract out "flags" operation - - show-branch.c: lift all_mask/all_revs to a global static - - show-branch.c: update comment style - Waiting for the final step to lift the hard-limit before sending it out. +* ta/parse-commit-with-skip-prefix (2014-03-04) 1 commit + (merged to 'next' on 2014-03-06 at 0244988) + + commit.c: use skip_prefix() instead of starts_with() + + Will merge to 'master'. --------------------------------------------------- -[Cooking] * ak/gitweb-fit-image (2014-02-20) 1 commit - - gitweb: Avoid overflowing page body frame with large images + (merged to 'next' on 2014-03-06 at ba8cb50) + + gitweb: Avoid overflowing page body frame with large images Instead of allowing an to be shown in whatever size, force scaling it to fit on the page with max-height/max-width css style attributes. - Will merge to 'next'. + Will merge to 'master'. -* da/difftool-git-files (2014-02-25) 2 commits - - WIP: test to protect the previous fix - - difftool: support repositories with .git-files +* da/difftool-git-files (2014-03-05) 2 commits + (merged to 'next' on 2014-03-06 at a563ec1) + + t7800: add a difftool test for .git-files + + difftool: support repositories with .git-files "git difftool" misbehaved when the repository is bound to the working tree with the ".git file" mechanism, where a textual file ".git" tells us where it is. - Will merge to 'next'. + Will merge to 'master'. -* jk/commit-dates-parsing-fix (2014-02-24) 5 commits - - log: do not segfault on gmtime errors - - log: handle integer overflow in timestamps - - date: check date overflow against time_t - - fsck: report integer overflow in author timestamps - - t4212: test bogus timestamps with git-log +* jk/commit-dates-parsing-fix (2014-03-07) 6 commits + (merged to 'next' on 2014-03-07 at 01e9d92) + + show_ident_date: fix tz range check + (merged to 'next' on 2014-03-06 at dd641e2) + + log: do not segfault on gmtime errors + + log: handle integer overflow in timestamps + + date: check date overflow against time_t + + fsck: report integer overflow in author timestamps + + t4212: test bogus timestamps with git-log - Will merge to 'next'. + Will merge to 'master'. * jk/diff-filespec-cleanup (2014-02-24) 1 commit @@ -786,40 +742,47 @@ of the repositories listed at * jk/remote-pushremote-config-reading (2014-02-24) 1 commit - - remote: handle pushremote config in any order + (merged to 'next' on 2014-03-06 at 9e71ecb) + + remote: handle pushremote config in any order - Will merge to 'next'. + Will merge to 'master'. * jk/repack-pack-keep-objects (2014-03-03) 1 commit - repack: add `repack.packKeptObjects` config var + Will merge to 'next'. + * jm/stash-doc-k-for-keep (2014-02-24) 1 commit - - stash doc: mention short form -k in save description + (merged to 'next' on 2014-03-06 at ddd8e48) + + stash doc: mention short form -k in save description - Will merge to 'next'. + Will merge to 'master'. * jn/am-doc-hooks (2014-02-24) 1 commit - - am doc: add a pointer to relevant hooks + (merged to 'next' on 2014-03-06 at 5c1c372) + + am doc: add a pointer to relevant hooks - Will merge to 'next'. + Will merge to 'master'. * mh/object-code-cleanup (2014-02-24) 4 commits - - sha1_file.c: document a bunch of functions defined in the file - - sha1_file_name(): declare to return a const string - - find_pack_entry(): document last_found_pack - - replace_object: use struct members instead of an array + (merged to 'next' on 2014-03-06 at d6b3867) + + sha1_file.c: document a bunch of functions defined in the file + + sha1_file_name(): declare to return a const string + + find_pack_entry(): document last_found_pack + + replace_object: use struct members instead of an array - Will merge to 'next'. + Will merge to 'master'. * nd/i18n-progress (2014-02-24) 1 commit - - i18n: mark all progress lines for translation + (merged to 'next' on 2014-03-06 at 600fd3e) + + i18n: mark all progress lines for translation - Will merge to 'next'. + Will merge to 'master'. * nd/sha1-file-delta-stack-leakage-fix (2014-02-24) 1 commit @@ -831,6 +794,8 @@ of the repositories listed at * tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit - demonstrate git-commit --dry-run exit code behaviour + Will merge to 'next'. + * fc/transport-helper-fixes (2014-02-24) 7 commits - remote-bzr: support the new 'force' option @@ -858,45 +823,50 @@ of the repositories listed at * jk/http-no-curl-easy (2014-02-18) 1 commit - - http: never use curl_easy_perform + (merged to 'next' on 2014-03-06 at 56d3f6f) + + http: never use curl_easy_perform Avoid use of the curl-easy family of functions, which interferes with connection reuse in a negative way. - Will merge to 'next'. + Will merge to 'master' and then to 'maint'. * jk/janitorial-fixes (2014-02-18) 5 commits - - open_istream(): do not dereference NULL in the error case - - builtin/mv: don't use memory after free - - utf8: use correct type for values in interval table - - utf8: fix iconv error detection - - notes-utils: handle boolean notes.rewritemode correctly + (merged to 'next' on 2014-03-06 at dac2de6) + + open_istream(): do not dereference NULL in the error case + + builtin/mv: don't use memory after free + + utf8: use correct type for values in interval table + + utf8: fix iconv error detection + + notes-utils: handle boolean notes.rewritemode correctly - Will merge to 'next'. + Will merge to 'master'. * ks/config-file-stdin (2014-02-18) 4 commits - - config: teach "git config --file -" to read from the standard input - - config: change git_config_with_options() interface - - builtin/config.c: rename check_blob_write() -> check_write() - - config: disallow relative include paths from blobs + (merged to 'next' on 2014-03-06 at 3e77313) + + config: teach "git config --file -" to read from the standard input + + config: change git_config_with_options() interface + + builtin/config.c: rename check_blob_write() -> check_write() + + config: disallow relative include paths from blobs - Will merge to 'next'. + Will merge to 'master'. * lb/contrib-contacts-looser-diff-parsing (2014-02-18) 1 commit - - git-contacts: do not fail parsing of good diffs + (merged to 'next' on 2014-03-06 at 1cc4ffe) + + git-contacts: do not fail parsing of good diffs - Will merge to 'next'. + Will merge to 'master'. * mh/replace-refs-variable-rename (2014-02-28) 3 commits - - Document some functions defined in object.c - - Add docstrings for lookup_replace_object() and do_lookup_replace_object() - - rename read_replace_refs to check_replace_refs + (merged to 'next' on 2014-03-06 at 70bf89b) + + Document some functions defined in object.c + + Add docstrings for lookup_replace_object() and do_lookup_replace_object() + + rename read_replace_refs to check_replace_refs - Will merge to 'next'. + Will merge to 'master'. * nd/commit-editor-cleanup (2014-02-25) 3 commits @@ -906,28 +876,32 @@ of the repositories listed at "git commit --cleanup=" learned a new mode, scissors. + Will merge to 'next'. + * nd/no-more-fnmatch (2014-02-20) 4 commits - - actually remove compat fnmatch source code - - stop using fnmatch (either native or compat) - - Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch" - - use wildmatch() directly without fnmatch() wrapper + (merged to 'next' on 2014-03-06 at f0b8f12) + + actually remove compat fnmatch source code + + stop using fnmatch (either native or compat) + + Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch" + + use wildmatch() directly without fnmatch() wrapper We started using wildmatch() in place of fnmatch(3); complete the process and stop using fnmatch(3). - Will merge to 'next'. + Will merge to 'master'. * nd/reset-setup-worktree (2014-02-18) 1 commit - - reset: optionally setup worktree and refresh index on --mixed + (merged to 'next' on 2014-03-06 at d93f20a) + + reset: optionally setup worktree and refresh index on --mixed "git reset" needs to refresh the index when working in a working tree (it can also be used to match the index to the HEAD in an otherwise bare repository), but it failed to set up the working tree properly, causing GIT_WORK_TREE to be ignored. - Will merge to 'next'. + Will merge to 'master'. * po/git-help-user-manual (2014-02-18) 1 commit @@ -935,34 +909,41 @@ of the repositories listed at I am not sure if this is even needed. + Will discard. + * rt/links-for-asciidoctor (2014-02-20) 1 commit - - Documentation: fix documentation AsciiDoc links for external urls + (merged to 'next' on 2014-03-06 at 547f13d) + + Documentation: fix documentation AsciiDoc links for external urls - Will merge to 'next'. + Will merge to 'master'. * tg/index-v4-format (2014-02-24) 3 commits - - read-cache: add index.version config variable - - test-lib: allow setting the index format version - - introduce GIT_INDEX_VERSION environment variable + (merged to 'next' on 2014-03-06 at d4ca5a8) + + read-cache: add index.version config variable + + test-lib: allow setting the index format version + + introduce GIT_INDEX_VERSION environment variable - Will merge to 'next'. + Will merge to 'master'. * tr/diff-submodule-no-reuse-worktree (2014-02-18) 1 commit - - diff: do not reuse_worktree_file for submodules + (merged to 'next' on 2014-03-06 at ac8008f) + + diff: do not reuse_worktree_file for submodules "git diff --external-diff" incorrectly fed the submodule directory in the working tree to the external diff driver when it knew it is the same as one of the versions being compared. - Will merge to 'next'. + Will merge to 'master'. -* nd/multiple-work-trees (2014-02-19) 26 commits - - FIXUP??? +* nd/multiple-work-trees (2014-03-06) 28 commits + - FIXUP: minimum compilation fix + - count-objects: report unused files in $GIT_DIR/repos/... - gc: support prune --repos + - gc: style change -- no SP before closing bracket - prune: strategies for linked checkouts - checkout: detach if the branch is already checked out elsewhere - checkout: clean up half-prepared directories in --to mode @@ -988,7 +969,7 @@ of the repositories listed at - Convert git_snpath() to strbuf_git_path() - path.c: make get_pathname() return strbuf instead of static buffer - The tip commit needs to be dropped; the series needs a serious review. + The series needs a serious review. * ks/tree-diff-nway (2014-03-04) 19 commits @@ -1011,7 +992,6 @@ of the repositories listed at - tree-diff: no need to manually verify that there is no mode change for a path - combine-diff: move changed-paths scanning logic into its own function - combine-diff: move show_log_first logic/action out of paths scanning - (this branch uses ks/combine-diff.) Instead of running N pair-wise diff-trees when inspecting a N-parent merge, find the set of paths that were touched by walking @@ -1021,26 +1001,17 @@ of the repositories listed at 2-way diff-tree, which is very nice. -* nd/daemonize-gc (2014-02-10) 2 commits - (merged to 'next' on 2014-02-25 at f592335) - + gc: config option for running --auto in background - + daemon: move daemonize() to libgit.a - - Originally merged to 'next' on 2014-02-20 - - Allow running "gc --auto" in the background. - - Will merge to 'master'. - - -* nd/gitignore-trailing-whitespace (2014-02-10) 2 commits - - dir: ignore trailing spaces in exclude patterns - - dir: warn about trailing spaces in exclude patterns +* nd/gitignore-trailing-whitespace (2014-03-11) 3 commits + (merged to 'next' on 2014-03-11 at ccdba51) + + t0008: skip trailing space test on Windows + (merged to 'next' on 2014-03-06 at f649a34) + + dir: ignore trailing spaces in exclude patterns + + dir: warn about trailing spaces in exclude patterns Warn and then ignore trailing whitespaces in .gitignore files, unless they are quoted for fnmatch(3), e.g. "path\ ". - Will merge to 'next'. + Will merge to 'master'. * nd/log-show-linear-break (2014-02-10) 1 commit @@ -1049,38 +1020,29 @@ of the repositories listed at Attempts to show where a single-strand-of-pearls break in "git log" output. - "git log --no-merges --show-linear-break" does not seem to work - well (tried on range "pu~10..pu" or something like that). + Will merge to 'next'. * ss/completion-rec-sub-fetch-push (2014-02-11) 1 commit - - completion: teach --recurse-submodules to fetch, pull and push + (merged to 'next' on 2014-03-06 at b5bf463) + + completion: teach --recurse-submodules to fetch, pull and push - Will merge to 'next'. + Will merge to 'master'. * jh/note-trees-record-blobs (2014-02-20) 1 commit - - notes: disallow reusing non-blob as a note object + (merged to 'next' on 2014-03-06 at f46852d) + + notes: disallow reusing non-blob as a note object "git notes -C " should not take an object that is not a blob. - Will merge to 'next'. - - -* jk/run-network-tests-by-default (2014-02-14) 1 commit - (merged to 'next' on 2014-02-25 at 62a8ad0) - + tests: turn on network daemon tests by default - - Originally merged to 'next' on 2014-02-20 - - Teach "make test" to run networking tests when possible by default. - Will merge to 'master'. * jc/check-attr-honor-working-tree (2014-02-06) 2 commits - - check-attr: move to the top of working tree when in non-bare repository - - t0003: do not chdir the whole test process + (merged to 'next' on 2014-03-06 at 960d679) + + check-attr: move to the top of working tree when in non-bare repository + + t0003: do not chdir the whole test process "git check-attr" when (trying to) work on a repository with a working tree did not work well when the working tree was specified @@ -1089,36 +1051,11 @@ of the repositories listed at The command also works in a bare repository but it reads from the (possibly stale, irrelevant and/or nonexistent) index, which may need to be fixed to read from HEAD, but that is a completely - separate issue. As a related tangentto this separate issue, we may - want to also fix "check-ignore", which refuses to work in a bare - repository, to also operate in a bare one. - - Will merge to 'next'. - - -* jk/makefile (2014-02-05) 16 commits - - FIXUP - - move LESS/LV pager environment to Makefile - - Makefile: teach scripts to include make variables - - FIXUP - - Makefile: auto-build C strings from make variables - - Makefile: drop *_SQ variables - - FIXUP - - Makefile: add c-quote helper function - - Makefile: introduce sq function for shell-quoting - - Makefile: always create files via make-var - - Makefile: store GIT-* sentinel files in MAKE/ - - Makefile: prefer printf to echo for GIT-* - - Makefile: use tempfile/mv strategy for GIT-* - - Makefile: introduce make-var helper function - - Makefile: fix git-instaweb dependency on gitweb - - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS - - Simplify the Makefile rules and macros that exist primarily for - quoting purposes, and make it easier to robustly express the - dependency rules. + separate issue. As a related tangent to this separate issue, we + may want to also fix "check-ignore", which refuses to work in a + bare repository, to also operate in a bare one. - Expecting a reroll. + Will merge to 'master'. * tr/remerge-diff (2014-02-26) 5 commits @@ -1138,25 +1075,6 @@ of the repositories listed at 'master'. -* ks/combine-diff (2014-02-24) 6 commits - (merged to 'next' on 2014-02-25 at 69e5a87) - + tests: add checking that combine-diff emits only correct paths - + combine-diff: simplify intersect_paths() further - + combine-diff: combine_diff_path.len is not needed anymore - + combine-diff: optimize combine_diff_path sets intersection - + diff test: add tests for combine-diff with orderfile - + diffcore-order: export generic ordering interface - (this branch is used by ks/tree-diff-nway.) - - Originally merged to 'next' on 2014-02-20 - - Teach combine-diff to honour the path-output-order imposed by - diffcore-order, and optimize how matching paths are found in - the N-way diffs made with parents. - - Will merge to 'master'. - - * lt/request-pull (2014-02-25) 5 commits - request-pull: resurrect "pretty refname" feature - request-pull: test updates @@ -1167,23 +1085,21 @@ of the repositories listed at Needs doc update but otherwise it should be ready for 'next'. -* cc/interpret-trailers (2014-02-20) 14 commits +* cc/interpret-trailers (2014-03-07) 11 commits - Documentation: add documentation for 'git interpret-trailers' - - trailer: add tests for commands using env variables - - trailer: set author and committer env variables - - trailer: add tests for trailer command + - trailer: add tests for commands in config file - trailer: execute command from 'trailer..command' - - trailer: if no input file is passed, read from stdin - trailer: add tests for "git interpret-trailers" - trailer: add interpret-trailers command - trailer: put all the processing together and print - - trailer: parse trailers from input file + - trailer: parse trailers from stdin - trailer: process command line trailer arguments - trailer: read and process config information - - trailer: process trailers from file and arguments - - trailer: add data structures and basic functions for commit trailers + - trailer: process trailers from stdin and arguments + - trailers: add data structures and basic functions - Will pick up the reroll but not today. + A new filter to programatically edit the tail end of the commit log + messages. * bl/blame-full-history (2014-01-14) 1 commit @@ -1202,50 +1118,6 @@ of the repositories listed at Will discard. -* jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits - - get_sha1: drop object/refname ambiguity flag - - get_sha1: speed up ambiguous 40-hex test - - FIXUP: teach DO_FOR_EACH_NO_RECURSE to prime_ref_dir() - - refs: teach for_each_ref a flag to avoid recursion - - cat-file: fix a minor memory leak in batch_objects - - cat-file: refactor error handling of batch_objects - - Expecting a reroll. - - -* ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit - - remote-hg: do not fail on invalid bookmarks - - Reported to break tests ($gmane/240005) - Expecting a reroll. - - -* cc/starts-n-ends-with-endgame (2013-12-05) 1 commit - (merged to 'next' on 2014-02-25 at 473e143) - + strbuf: remove prefixcmp() and suffixcmp() - - Originally merged to 'next' on 2014-01-07 - - Endgame for the cc/starts-n-ends-with topic; this needs to be - evil-merged with other topics that introduce new uses of - prefix/suffix-cmp functions. - - Will merge to 'master' for 2.0.0 - - -* gj/push-more-verbose-advice (2013-11-13) 1 commit - (merged to 'next' on 2014-02-25 at 1cd10b0) - + push: switch default from "matching" to "simple" - - Originally merged to 'next' on 2013-11-21 - - Explain 'simple' and 'matching' in "git push" advice message; the - topmost patch is a rebase of jc/push-2.0-default-to-simple on top - of it. - - Will merge to 'master' for 2.0.0 - - * tr/merge-recursive-index-only (2014-02-05) 3 commits - merge-recursive: -Xindex-only to leave worktree unchanged - merge-recursive: internal flag to avoid touching the worktree @@ -1254,56 +1126,6 @@ of the repositories listed at Will hold. - -* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit - (merged to 'next' on 2014-02-25 at 9e5c0d2) - + git add: -u/-A now affects the entire working tree - - Originally merged to 'next' on 2013-12-06 - - Will merge to 'master' for 2.0.0 - - -* jc/core-checkstat-2.0 (2013-05-06) 1 commit - (merged to 'next' on 2014-02-25 at 62f6aeb) - + core.statinfo: remove as promised in Git 2.0 - - Originally merged to 'next' on 2013-12-06 - - Will merge to 'master' for 2.0.0 - - -* jc/push-2.0-default-to-simple (2013-06-18) 1 commit - (merged to 'next' on 2014-02-25 at 1f0e178) - + push: switch default from "matching" to "simple" - - Originally merged to 'next' on 2013-12-06 - - Will merge to 'master' for 2.0.0 - - -* jc/add-2.0-ignore-removal (2013-04-22) 1 commit - (merged to 'next' on 2014-02-25 at a0d018a) - + git add ... defaults to "-A" - - Originally merged to 'next' on 2013-12-06 - - Updated endgame for "git add " that defaults to "--all" - aka "--no-ignore-removal". - - Will merge to 'master' for 2.0.0 - - -* jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit - (merged to 'next' on 2014-02-25 at ccfff88) - + diff: remove "diff-files -q" in a version of Git in a distant future - - Originally merged to 'next' on 2013-12-06 - - Remove deprecated "-q" option "git diff-files". - - Will cook in 'next' until a distant future. - -------------------------------------------------- [Discarded] @@ -1345,6 +1167,3 @@ of the repositories listed at Code refactoring. Now part of ks/tree-diff-nway. - - - -- 2.11.4.GIT