Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
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] * bc/log-decoration (2013-12-20) 1 commit - log: properly handle decorations with chained tags "git log --decorate" did not handle a tag pointed by another tag nicely. Will merge to 'next'. * jh/rlimit-nofile-fallback (2013-12-18) 1 commit - get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure When we figure out how many file descriptors to allocate for keeping packfiles open, a system with non-working getrlimit() could cause us to die(), but because we make this call only to get a rough estimate of how many is available and we do not even attempt to use up all file descriptors available ourselves, it is nicer to fall back to a reasonable low value rather than dying. Will merge to 'next'. * rt/bfg-ad-in-filter-branch-doc (2013-12-18) 1 commit - docs: add filter-branch notes on The BFG Will merge to 'next'. * sb/diff-orderfile-config (2013-12-18) 3 commits - diff: add diff.orderfile configuration variable - diff: let "git diff -O" read orderfile from any file and fail properly - t4056: add new tests for "git diff -O" Allow "git diff -O<file>" to be configured with a new configuration variable. Will merge to 'next'. * jc/graph-post-root-gap (2013-12-20) 1 commit - graph: give an extra gap after showing root commit This was primarily a RFH ($gmane/239580). * nd/daemon-informative-errors-typofix (2013-12-20) 1 commit - daemon: be strict at parsing parameters --[no-]informative-errors Will merge to 'next'. * tm/fetch-prune (2013-12-20) 2 commits - fetch --prune: run prune before fetching - fetch --prune: always print header url Fetching 'frotz' branch with "git fetch", while having 'frotz/nitfol' remote-tracking branch from an earlier fetch, would error out, primarily because the command has not been told to remove anything on our side. In such a case, "git fetch --prune" can be used to remove 'frotz/nitfol' to make room to fetch and store 'frotz' remote-tracking branch. Will merge to 'next'. * jk/oi-delta-base (2013-12-26) 2 commits - cat-file: provide %(deltabase) batch format - sha1_object_info_extended: provide delta base sha1s Teach "cat-file --batch" to show delta-base object name for a packed object that is represented as a delta. Will merge to 'next'. * jk/sha1write-void (2013-12-26) 1 commit - do not pretend sha1write returns errors Code clean-up. Will merge to 'next'. * jl/submodule-recursive-checkout (2013-12-26) 5 commits - Teach checkout to recursively checkout submodules - submodule: teach unpack_trees() to update submodules - submodule: teach unpack_trees() to repopulate submodules - submodule: teach unpack_trees() to remove submodule contents - submodule: prepare for recursive checkout of submodules * mh/safe-create-leading-directories (2013-12-26) 5 commits - rename_ref(): fix a mkdir()/rmdir() race - safe_create_leading_directories(): fix a mkdir/rmdir race - safe_create_leading_directories(): add "slash" pointer - safe_create_leading_directories(): reduce scope of local variable - safe_create_leading_directories(): modernize format of "if" chaining Code clean-up and protection against concurrent write access to the ref namespace. Will merge to 'next'. * nd/add-empty-fix (2013-12-26) 1 commit - add: don't complain when adding empty project root "git add -A" (no other arguments) in a totally empty working tree used to emit an error. Will merge to 'next'. * nd/commit-tree-constness (2013-12-26) 1 commit - commit.c: make "tree" a const pointer in commit_tree*() Code clean-up. Will merge to 'next'. -------------------------------------------------- [Stalled] * mo/subtree-split-updates (2013-12-10) 3 commits - subtree: add --edit option - subtree: allow --squash and --message with push - subtree: support split --rejoin --squash Comments? * hv/submodule-ignore-fix (2013-12-06) 4 commits - disable complete ignorance of submodules for index <-> HEAD diff - always show committed submodules in summary after commit - teach add -f option for ignored submodules - fix 'git add' to skip submodules configured as ignored Teach "git add" to be consistent with "git status" when changes to submodules are set to be ignored, to avoid surprises after checking with "git status" to see there isn't any change to be further added and then see that "git add ." adds changes to them. I think a reroll is coming, so this may need to be replaced, but I needed some practice with heavy conflict resolution. It conflicts with two changes to "git add" that have been scheduled for Git 2.0 quite badly, and I think I got the resolution right this time (a few nights ago I tried and failed and that was why it hasn't been merged to 'pu' so far). * kb/fast-hashmap (2013-12-18) 18 commits - hashmap.h: make sure map entries are tightly packed - hashmap.h: Use 'unsigned int' for hash-codes everywhere (merged to 'next' on 2013-12-16 at bff99b1) + Drop unnecessary #includes from test-hashmap + Add test-hashmap to .gitignore (merged to 'next' on 2013-12-06 at f90be3d) + 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 Improvements to our hash table to get it to meet the needs of the msysgit fscache project, with some nice performance improvements. The tip one does not seem to have reached concensus (yet). * jc/create-directories-microopt (2013-11-11) 1 commit - checkout: most of the time we have good leading directories Of unknown value until tested on non-Linux platforms (especially Windows). Will hold. * jt/commit-fixes-footer (2013-10-30) 1 commit - commit: Add -f, --fixes <commit> option to add Fixes: line There is an ongoing discussion around this topic; in general I am fairly negative on a new feature that is too narrow and prefer a more generic solution that can be tailored for specific needs, as many people stated in the thread. It appears that the discussion stalled. * np/pack-v4 (2013-09-18) 90 commits . packv4-parse.c: add tree offset caching . t1050: replace one instance of show-index with verify-pack . index-pack, pack-objects: allow creating .idx v2 with .pack v4 . unpack-objects: decode v4 trees . unpack-objects: allow to save processed bytes to a buffer - ... Nico and Duy advancing the eternal vaporware pack-v4. This is here primarily for wider distribution of the preview edition. Temporarily ejected from 'pu', to try out jk/pack-bitmap, which this topic conflicts with. * mf/graph-show-root (2013-10-25) 1 commit . graph.c: mark root commit differently In a repository with multiple-roots, "log --graph", especially with "--oneline", does not give the reader enough visual cue to see where one line of history ended and a separate history began. This is the version that marks the roots 'x' when they would have been marked as '*'; Keshav Kini suggested an alternative of giving an extra blank line after every root, which I tend to think is a better approach to the problem. * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits - perf-lib: add test_perf_cleanup target - perf-lib: split starting the test from the execution Add test_perf_cleanup shell function to the perf suite, that allows the script writers to define a test with a clean-up action. Holding until needed. * yt/shortened-rename (2013-10-18) 2 commits - SQUASH??? style fixes and s/omit/shorten/ where appropriate - diff.c: keep arrow(=>) on show_stats()'s shortened filename part to make rename visible Attempts to give more weight on the fact that a filepair represents a rename than showing substring of the actual path when diffstat lines are not wide enough. I am not sure if that is solving a right problem, though. * rv/send-email-cache-generated-mid (2013-08-21) 2 commits - git-send-email: Cache generated message-ids, use them when prompting - git-send-email: add optional 'choices' parameter to the ask sub * rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits - ### DONTMERGE: needs better explanation on what config they need - 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. 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 * 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] * jk/pack-bitmap (2013-12-26) 23 commits - 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/mingw.h: teach PRIx64 format to the MinGW and msvc builds - 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 + sha1write: make buffer const-correct (this branch is tangled with jk/name-pack-after-byte-representation.) Borrows 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. * ap/path-max (2013-12-16) 1 commit - Prevent buffer overflows when path is too long Will merge to 'next'. * mh/path-max (2013-12-18) 2 commits - builtin/prune.c: use strbuf to avoid having to worry about PATH_MAX - prune-packed: use strbuf to avoid having to worry about PATH_MAX A few places where we relied on a fixed length buffer to hold pathnames in these two programs have been converted to use strbuf. Will merge to 'next'. * nv/commit-gpgsign-config (2013-12-17) 3 commits - test the commit.gpgsign config option - commit-tree: add and document --no-gpg-sign - Add the commit.gpgsign option to sign all commits 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. Will merge to 'next'. * cc/replace-object-info (2013-12-12) 10 commits (merged to 'next' on 2013-12-17 at aeb9e18) + Documentation/git-replace: describe --format option + builtin/replace: unset read_replace_refs + t6050: add tests for listing with --format + builtin/replace: teach listing using short, medium or full formats + sha1_file: perform object replacement in sha1_object_info_extended() + t6050: show that git cat-file --batch fails with replace objects + sha1_object_info_extended(): add an "unsigned flags" parameter + sha1_file.c: add lookup_replace_object_extended() to pass flags + replace_object: don't check read_replace_refs twice + rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT read_sha1_file() that is the workhorse to read the contents given an object name honoured object replacements, but there is no corresponding mechanism to sha1_object_info() that is used to obtain the metainfo (e.g. type & size) about the object, leading callers to weird inconsistencies. Has this been reviewed sufficiently? Will merge to 'next'. * fc/completion (2013-12-09) 1 commit - completion: fix completion of certain aliases SZEDER Gábor noticed that this breaks "git -c var=val alias" and also suggested a better description of the change. Will hold. * fc/remote-helper-fixes (2013-12-26) 5 commits (merged to 'next' on 2013-12-26 at ce5f872) + remote-hg: test 'shared_path' in a moved clone (merged to 'next' on 2013-12-17 at aa4dc07) + remote-hg: add tests for special filenames + remote-hg: fix 'shared path' path + remote-helpers: add extra safety checks + remote-hg: avoid buggy strftime() Will merge to 'master'. * jk/cat-file-regression-fix (2013-12-12) 2 commits (merged to 'next' on 2013-12-13 at 3713e01) + cat-file: handle --batch format with missing type/size + cat-file: pass expand_data to print_object_or_die "git cat-file --batch=", an admittedly useless command, did not behave very well. Will merge to 'master'. * jk/pull-rebase-using-fork-point (2013-12-10) 2 commits (merged to 'next' on 2013-12-13 at 1862c12) + rebase: use reflog to find common base with upstream + pull: use merge-base --fork-point when appropriate Will merge to 'master'. * jk/rev-parse-double-dashes (2013-12-09) 2 commits (merged to 'next' on 2013-12-13 at d26bac7) + rev-parse: be more careful with munging arguments + rev-parse: correctly diagnose revision errors before "--" "git rev-parse <revs> -- <paths>" did not implement the usual disambiguation rules the commands in the "git log" family used in the same way. Will merge to 'master'. * nd/shallow-clone (2013-12-10) 28 commits - git-clone.txt: remove shallow clone limitations - prune: clean .git/shallow after pruning objects - clone: use git protocol for cloning shallow repo locally - send-pack: support pushing from a shallow clone via http - receive-pack: support pushing to a shallow clone via http - smart-http: support shallow fetch/clone - remote-curl: pass ref SHA-1 to fetch-pack as well - send-pack: support pushing to a shallow clone - receive-pack: allow pushes that update .git/shallow - connected.c: add new variant that runs with --shallow-file - add GIT_SHALLOW_FILE to propagate --shallow-file to subprocesses - receive/send-pack: support pushing from a shallow clone - receive-pack: reorder some code in unpack() - fetch: add --update-shallow to accept refs that update .git/shallow - upload-pack: make sure deepening preserves shallow roots - fetch: support fetching from a shallow repository - clone: support remote shallow repository - fetch-pack.h: one statement per bitfield declaration - fetch-pack.c: move shallow update code out of fetch_pack() - shallow.c: steps 6 and 7 to select new commits for .git/shallow - shallow.c: the 8 steps to select new commits for .git/shallow - shallow.c: extend setup_*_shallow() to accept extra shallow commits - connect.c: teach get_remote_heads to parse "shallow" lines - make the sender advertise shallow commits to the receiver - clone: prevent --reference to a shallow repository - send-pack: forbid pushing from a shallow repository - remote.h: replace struct extra_have_objects with struct sha1_array - transport.h: remove send_pack prototype, already defined in send-pack.h Fetching from a shallow-cloned repository used to be forbidden, primarily because the codepaths involved were not carefully vetted and we did not bother supporting such usage. This attempts to allow object transfer out of a shallow-cloned repository in a controlled way (i.e. the receiver become a shallow repository with truncated history). Will merge to 'next'. * tg/diff-no-index-refactor (2013-12-16) 4 commits (merged to 'next' on 2013-12-17 at 009d8d8) + diff: avoid some nesting + diff: add test for --no-index executed outside repo (merged to 'next' on 2013-12-13 at 523f7c4) + diff: don't read index when --no-index is given + diff: move no-index detection to builtin/diff.c "git diff ../else/where/A ../else/where/B" when ../else/where is clearly outside the repository, and "git diff --no-index A B", do not have to look at the index at all, but we used to read the index unconditionally. Will merge to 'master'. * fc/transport-helper-fixes (2013-12-09) 6 commits - remote-bzr: support the new 'force' option - test-hg.sh: tests are now expected to pass - transport-helper: check for 'forced update' message - transport-helper: add 'force' to 'export' helpers - transport-helper: don't update refs in dry-run - transport-helper: mismerge fix Updates transport-helper, fast-import and fast-export to allow the ref mapping and ref deletion in a way similar to the natively supported transports. Will hold. Reported to break t5541. * jn/git-gui-chmod+x (2013-11-25) 1 commit - git-gui: chmod +x po2msg, windows/git-gui.sh Parked here until I get the same change back from the upstream git-gui tree. * jn/gitk-chmod+x (2013-11-25) 1 commit - gitk: chmod +x po2msg Parked here until I get the same change back from the upstream gitk tree. * jk/name-pack-after-byte-representation (2013-12-16) 3 commits (merged to 'next' on 2013-12-17 at 0bc385c) + pack-objects doc: treat output filename as opaque (merged to 'next' on 2013-12-09 at 247b2d0) + pack-objects: name pack files after trailer hash + sha1write: make buffer const-correct (this branch is tangled with jk/pack-bitmap.) Two packfiles that contain the same set of objects have traditionally been named identically, but that made repacking a repository that is already fully packed without any cruft with a different packing parameter cumbersome. Update the convention to name the packfile after the bytestream representation of the data, not after the set of objects in it. Will merge to 'master'. * nd/negative-pathspec (2013-12-06) 3 commits (merged to 'next' on 2013-12-12 at 9f340c8) + pathspec.c: support adding prefix magic to a pathspec with mnemonic magic + Support pathspec magic :(exclude) and its short form :! + glossary-content.txt: rephrase magic signature part Introduce "negative pathspec" magic, to allow "git log -- . ':!dir'" to tell us "I am interested in everything but 'dir' directory". Will cook in 'next'. * zk/difftool-counts (2013-12-16) 2 commits (merged to 'next' on 2013-12-16 at 0e0d235) + diff.c: fix some recent whitespace style violations (merged to 'next' on 2013-12-12 at ba35694) + difftool: display the number of files in the diff queue in the prompt Show the total number of paths and the number of paths shown so far when "git difftool" prompts to launch an external diff tool, which would give users some sense of progress. Will merge to 'master'. * cc/starts-n-ends-with-endgame (2013-12-05) 1 commit - strbuf: remove prefixcmp() and suffixcmp() 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. * jc/push-refmap (2013-12-04) 3 commits (merged to 'next' on 2013-12-12 at 71e358f) + push: also use "upstream" mapping when pushing a single ref + push: use remote.$name.push as a refmap + builtin/push.c: use strbuf instead of manual allocation Make "git push origin master" update the same ref that would be updated by our 'master' when "git push origin" (no refspecs) is run while the 'master' branch is checked out, which makes "git push" more symmetric to "git fetch" and more usable for the triangular workflow. Will merge to 'master'. * js/gnome-keyring (2013-12-16) 1 commit (merged to 'next' on 2013-12-17 at 422fd61) + contrib/git-credential-gnome-keyring.c: small stylistic cleanups Style fix. Will merge to 'master'. * gj/push-more-verbose-advice (2013-11-13) 1 commit (merged to 'next' on 2013-12-06 at 574b18a) + 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 cook in 'next' until Git 2.0. * tr/merge-recursive-index-only (2013-10-28) 3 commits - merge-recursive: -Xindex-only to leave worktree unchanged - merge-recursive: internal flag to avoid touching the worktree - merge-recursive: remove dead conditional in update_stages() Will hold until using script appears. * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit (merged to 'next' on 2013-12-06 at ead2ec8) + git add: -u/-A now affects the entire working tree Will cook in 'next' until Git 2.0. * jc/core-checkstat-2.0 (2013-05-06) 1 commit (merged to 'next' on 2013-12-06 at ae18007) + core.statinfo: remove as promised in Git 2.0 Will cook in 'next' until Git 2.0. * jc/push-2.0-default-to-simple (2013-06-18) 1 commit (merged to 'next' on 2013-12-06 at 6fad61c) + push: switch default from "matching" to "simple" Will cook in 'next' until Git 2.0. * jc/add-2.0-ignore-removal (2013-04-22) 1 commit (merged to 'next' on 2013-12-06 at fbaa75a) + git add <pathspec>... defaults to "-A" Updated endgame for "git add <pathspec>" that defaults to "--all" aka "--no-ignore-removal". Will cook in 'next' until Git 2.0. * jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit (merged to 'next' on 2013-12-06 at 083d67c) + diff: remove "diff-files -q" in a version of Git in a distant future Will cook in 'next' until a distant future. -------------------------------------------------- [Discarded] * aa/transport-non-positive-depth-only (2013-11-26) 1 commit . transport: catch non positive --depth option value * cc/remote-remove-redundant-postfixcmp (2013-11-06) 2 commits . Rename suffixcmp() to has_suffix() and invert its result . builtin/remote: remove postfixcmp() and use suffixcmp() instead * th/reflog-annotated-tag (2013-10-28) 1 commit . reflog: handle lightweight and annotated tags equally "git log -g $annotated_tag", when there is no reflog history, should have produced a single output entry (i.e. the ref creation event), but instead showed the history leading to the tag. Broken at the design level. Any reflog entry that points at a non commit needs to be handled with new code that does not exist yet, and lifting the "this code handles only commits" without adding such code does not solve anything. -- 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