From eba9f55f5841837fdcbf84575a4c0b6ca45b5457 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 22 Apr 2013 13:01:55 -0700 Subject: [PATCH] What's cooking (2013/04 #07) --- whats-cooking.txt | 661 +++++++++++++++++++++++++----------------------------- 1 file changed, 303 insertions(+), 358 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 3f09bbcda6..13a93cc663 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,16 +1,20 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Apr 2013, #06; Thu, 18) -X-master-at: 1468a5839309033feb2e58943babdd48b8e2d151 -X-next-at: 630c2117d6a92f48910bfc4663f752cfaa0b30fa +Subject: What's cooking in git.git (Apr 2013, #07; Mon, 22) +X-master-at: 118f60ee06612083ff4f1810424e80a3e896f73e +X-next-at: 46dda50f1b80376d17129b9546d08f602af44864 -What's cooking in git.git (Apr 2013, #06; Thu, 18) +What's cooking in git.git (Apr 2013, #07; Mon, 22) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. +Both of the two topics on preparing "git add" users for the +behaviour change in Git 2.0 are in 'master'. We may want to tweak +the wording of warning messages and such before the feature freeze. + You can find the changes described here in the integration branches of the repositories listed at @@ -19,177 +23,250 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* fc/completion (2013-04-14) 8 commits - (merged to 'next' on 2013-04-14 at a509746) - + completion: small optimization - + completion: inline __gitcomp_1 to its sole callsite - + completion: get rid of compgen - + completion: add __gitcomp_nl tests - + completion: add new __gitcompadd helper - + completion: get rid of empty COMPREPLY assignments - + completion: trivial test improvement - + completion: add more cherry-pick options +* ap/strbuf-humanize (2013-04-10) 2 commits + (merged to 'next' on 2013-04-14 at 66d7af5) + + count-objects: add -H option to humanize sizes + + strbuf: create strbuf_humanise_bytes() to show byte sizes - In addition to a user visible change to offer more options to - cherry-pick, generally cleans up and simplifies the code. + Teach "--human-readable" aka "-H" option to "git count-objects" to + show various large numbers in Ki/Mi/GiB scaled as necessary. + I've decided to let this topic supersede mc/count-objects-kibibytes. + Human users will get an even easier output with "-H" and by not + changing the output without an explicit option we do not have to + break third-party tools that may have been reading from the output + of this command. -* fc/send-email-annotate (2013-04-14) 7 commits - (merged to 'next' on 2013-04-14 at 4af1076) - + rebase-am: explicitly disable cover-letter - + format-patch: trivial cleanups - + format-patch: add format.coverLetter configuration variable - + log: update to OPT_BOOL - + format-patch: refactor branch name calculation - + format-patch: improve head calculation for cover-letter - + send-email: make annotate configurable - Allows format-patch --cover-letter to be configurable; the most - notable is the "auto" mode to create cover-letter only for multi - patch series. +* as/clone-reference-with-gitfile (2013-04-09) 2 commits + (merged to 'next' on 2013-04-15 at ab0d128) + + clone: Allow repo using gitfile as a reference + + clone: Fix error message for reference repository + "git clone" did not work if a repository pointed at by the + "--reference" option is a gitfile that points at another place. -* jc/detached-head-doc (2013-04-05) 1 commit - (merged to 'next' on 2013-04-14 at 24b9271) - + glossary: extend "detached HEAD" description - Describe what happens when a command that operates on "the current - branch" is run on a detached HEAD. +* fc/branch-upstream-color (2013-04-15) 1 commit + (merged to 'next' on 2013-04-15 at 2fc50fd) + + branch: colour upstream branches + Add more colors to "git branch -vv" output. -* jk/daemon-user-doc (2013-04-12) 1 commit - (merged to 'next' on 2013-04-14 at 56c08ff) - + doc: clarify that "git daemon --user=" option does not export HOME=~user - Document where the configuration is read by the git-daemon when its - --user option is used. +* fc/remote-hg (2013-04-11) 21 commits + (merged to 'next' on 2013-04-16 at cbeaf41) + + remote-hg: activate graphlog extension for hg_log() + + remote-hg: fix bad file paths + + remote-hg: document location of stored hg repository + + remote-hg: fix bad state issue + + remote-hg: add 'insecure' option + + remote-hg: add simple mail test + + remote-hg: add basic author tests + + remote-hg: show more proper errors + + remote-hg: force remote push + + remote-hg: push to the appropriate branch + + remote-hg: update tags globally + + remote-hg: update remote bookmarks + + remote-hg: refactor export + + remote-hg: split bookmark handling + + remote-hg: redirect buggy mercurial output + + remote-hg: trivial test cleanups + + remote-hg: make sure fake bookmarks are updated + + remote-hg: fix for files with spaces + + remote-hg: properly report errors on bookmark pushes + + remote-hg: add missing config variable in doc + + remote-hg: trivial cleanups + Updates remote-hg helper (in contrib/). -* jk/http-dumb-namespaces (2013-04-09) 1 commit - (merged to 'next' on 2013-04-15 at 4bfa834) - + http-backend: respect GIT_NAMESPACE with dumb clients - Allow smart-capable HTTP servers to be restricted via the - GIT_NAMESPACE mechanism when talking with commit-walker clients - (they already do so when talking with smart HTTP clients). +* jk/a-thread-only-dies-once (2013-04-16) 2 commits + (merged to 'next' on 2013-04-18 at 3208f44) + + run-command: use thread-aware die_is_recursing routine + + usage: allow pluggable die-recursion checks + A regression fix for the logic to detect die() handler triggering + itself recursively. -* jk/http-error-messages (2013-04-16) 1 commit - (merged to 'next' on 2013-04-16 at 4a32517) - + http: set curl FAILONERROR each time we select a handle - A regression fix for the recently graduated topic. +* jk/chopped-ident (2013-04-17) 3 commits + (merged to 'next' on 2013-04-19 at ecec2d4) + + blame: handle broken commit headers gracefully + + pretty: handle broken commit headers gracefully + + cat-file: print tags raw for "cat-file -p" + A commit object whose author or committer ident are malformed + crashed some code that trusted that a name, an email and an + timestamp can always be found in it. -* jk/merge-tree-added-identically (2013-04-08) 1 commit - (merged to 'next' on 2013-04-15 at 35fd4b9) - + merge-tree: don't print entries that match "local" - The resolution of some corner cases by "git merge-tree" were - inconsistent between top-of-the-tree and in a subdirectory. +* jk/doc-http-backend (2013-04-13) 3 commits + (merged to 'next' on 2013-04-19 at 7932840) + + doc/http-backend: match query-string in apache half-auth example + + doc/http-backend: give some lighttpd config examples + + doc/http-backend: clarify "half-auth" repo configuration + Improve documentation to illustrate "push authenticated, fetch + anonymous" configuration for smart HTTP servers. -* jk/test-trash (2013-04-14) 2 commits - (merged to 'next' on 2013-04-15 at 15a6624) - + t/test-lib.sh: drop "$test" variable - + t/test-lib.sh: fix TRASH_DIRECTORY handling - Fix longstanding issues with the test harness when used with --root= - option. +* jx/i18n-branch-error-messages (2013-04-15) 1 commit + (merged to 'next' on 2013-04-18 at 630c211) + + i18n: branch: mark strings for translation -* kb/co-orphan-suggestion-short-sha1 (2013-04-08) 1 commit - (merged to 'next' on 2013-04-14 at 8caf7fd) - + checkout: abbreviate hash in suggest_reattach +* lf/read-blob-data-from-index (2013-04-17) 3 commits + (merged to 'next' on 2013-04-17 at 611208f) + + convert.c: remove duplicate code + + read_blob_data_from_index(): optionally return the size of blob data + + attr.c: extract read_index_data() as read_blob_data_from_index() - Update the informational message when "git checkout" leaves the - detached head state. + Reduce duplicated code between convert.c and attr.c. -* rs/empty-archive (2013-04-10) 1 commit - (merged to 'next' on 2013-04-15 at eab39bc) - + t5004: fix issue with empty archive test and bsdtar +* mv/sequencer-pick-error-diag (2013-04-11) 1 commit + (merged to 'next' on 2013-04-16 at a2da926) + + cherry-pick: make sure all input objects are commits - Implementations of "tar" of BSD descend have found to have trouble - with reading an otherwise empty tar archive with pax headers and - causes an unnecessary test failure. + "git cherry-pick $blob $tree" is diagnosed as a nonsense. -* th/t9903-symlinked-workdir (2013-04-11) 1 commit - (merged to 'next' on 2013-04-15 at f062dc6) - + t9903: Don't fail when run from path accessed through symlink +* mv/ssl-ftp-curl (2013-04-12) 1 commit + (merged to 'next' on 2013-04-15 at 7fdada6) + + Support FTP-over-SSL/TLS for regular FTP + Does anybody really use commit walkers over ftp??? -* tr/packed-object-info-wo-recursion (2013-03-27) 3 commits - (merged to 'next' on 2013-03-29 at b1c3858) - + sha1_file: remove recursion in unpack_entry - + Refactor parts of in_delta_base_cache/cache_or_unpack_entry - + sha1_file: remove recursion in packed_object_info - Attempts to reduce the stack footprint of sha1_object_info() - and unpack_entry() codepaths. +* nd/checkout-keep-sparse (2013-04-15) 1 commit + (merged to 'next' on 2013-04-19 at 803dabc) + + checkout: add --ignore-skip-worktree-bits in sparse checkout mode --------------------------------------------------- -[New Topics] + Make the initial "sparse" selection of the paths more sticky across + "git checkout". -* jk/a-thread-only-dies-once (2013-04-16) 2 commits - (merged to 'next' on 2013-04-18 at 3208f44) - + run-command: use thread-aware die_is_recursing routine - + usage: allow pluggable die-recursion checks - A regression fix for the logic to detect die() handler triggering - itself recursively. +* rt/commentchar-fmt-merge-msg (2013-04-18) 1 commit + (merged to 'next' on 2013-04-18 at 96799bd) + + t6200: avoid path mangling issue on Windows - Will fast-track to 'master'. + A test fix for recent update. + + +* ta/glossary (2013-04-15) 4 commits + (merged to 'next' on 2013-04-19 at 63ee8a4) + + glossary: improve definitions of refspec and pathspec + + The name of the hash function is "SHA-1", not "SHA1" + + glossary: improve description of SHA-1 related topics + + glossary: remove outdated/misleading/irrelevant entries +* th/bisect-final-log (2013-04-15) 1 commit + (merged to 'next' on 2013-04-19 at 89d2041) + + bisect: Store first bad commit as comment in log file + + Leave a commit to note what the final outcome was in the bisect log + file. + * tr/copy-revisions-from-stdin (2013-04-16) 1 commit (merged to 'next' on 2013-04-16 at d882870) + read_revisions_from_stdin: make copies for handle_revision_arg A fix to a long-standing issue in the command line parser for - revisions, which was triggered by mv/sequence-pick-error-diag topic - (now in 'next'). + revisions, which was triggered by mv/sequence-pick-error-diag topic. - Will merge to 'master'. +-------------------------------------------------- +[New Topics] +* jh/checkout-auto-tracking (2013-04-21) 8 commits + (merged to 'next' on 2013-04-22 at 2356700) + + glossary: Update and rephrase the definition of a remote-tracking branch + + branch.c: Validate tracking branches with refspecs instead of refs/remotes/* + + t9114.2: Don't use --track option against "svn-remote"-tracking branches + + t7201.24: Add refspec to keep --track working + + t3200.39: tracking setup should fail if there is no matching refspec. + + checkout: Use remote refspecs when DWIMming tracking branches + + t2024: Show failure to use refspec when DWIMming remote branch names + + t2024: Add tests verifying current DWIM behavior of 'git checkout ' + + Updates "git checkout foo" that DWIMs the intended "upstream" and + turns it into "git checkout -t -b foo remotes/origin/foo" to + correctly take existing remote definitions into account. The + remote "origin" may be what uniquely map its own branch to + remotes/some/where/foo but that some/where may not be "origin". + + Will cook in 'next'. + + +* mg/more-textconv (2013-04-19) 6 commits + - grep: honor --textconv for the case rev:path + - grep: allow to use textconv filters + - t7008: demonstrate behavior of grep with textconv + - cat-file: do not die on --textconv without textconv filters + - show: honor --textconv for blobs + - t4030: demonstrate behavior of show with textconv -* jc/prune-all (2013-04-18) 3 commits - - api-parse-options.txt: document "no-" for non-boolean options - - git-gc.txt, git-reflog.txt: document new expiry options - - date.c: add parse_expiry_date() + Will be rerolled. - We used the approxidate() parser for "--expire=" options - of various commands, but it is better to treat --expire=all and - --expire=now a bit more specially than using the current timestamp. - Update "git gc" and "git reflog" with a new parsing function for - expiry dates. +* jk/receive-pack-deadlocks-with-early-failure (2013-04-19) 1 commit + (merged to 'next' on 2013-04-22 at 1e27177) + + receive-pack: close sideband fd on early pack errors -* jk/chopped-ident (2013-04-17) 3 commits - - blame: handle broken commit headers gracefully - - pretty: handle broken commit headers gracefully - - cat-file: print tags raw for "cat-file -p" + When receive-pack detects error in the pack header it received in + order to decide which of unpack-objects or index-pack to run, it + returned without closing the error stream, which led to a hang + sideband thread. - A commit object whose author or committer ident are malformed - crashed some code that trusted that a name, an email and an - timestamp can always be found in it. + Will fast-track to 'master'. - Will merge to 'next'. +* fc/untracked-zsh-prompt (2013-04-21) 1 commit + (merged to 'next' on 2013-04-22 at 472da3e) + + prompt: fix untracked files for zsh -* rt/commentchar-fmt-merge-msg (2013-04-18) 1 commit - (merged to 'next' on 2013-04-18 at 96799bd) - + t6200: avoid path mangling issue on Windows + Will fast-track to 'master'. - A test fix for recent update. - Will fast-track to 'master'. +* jn/glossary-revision (2013-04-21) 1 commit + - glossary: a revision is just a commit + + The wording for "revision" in the glossary wanted to say it refers + to "commit (noun) as a concept" but it was badly phrased. + + Will cook in 'next'. + + This may need further updates to hint that in contexts where it is + clear, the word may refer to an object name, not necessarily a + commit. + + +* rr/shortlog-doc (2013-04-22) 8 commits + - builtin/shortlog.c: make usage string consistent with log + - builtin/log.c: make usage string consistent with doc + - git-shortlog.txt: make SYNOPSIS match log, update OPTIONS + - git-log.txt: rewrite note on why "--" may be required + - git-log.txt: generalize .. + - git-log.txt: order OPTIONS properly; move .. + - revisions.txt: clarify the .. and ... syntax + - git-shortlog.txt: remove (-h|--help) from OPTIONS + + Update documentation for "log" and "shortlog". + + Looked reasonable. + Will merge to 'next'. + + +* mh/multimail (2013-04-21) 1 commit + - git-multimail: a replacement for post-receive-email + + Waiting for comments. -------------------------------------------------- [Stalled] -* jc/format-patch (2013-02-21) 2 commits +* jc/format-patch (2013-04-22) 2 commits - format-patch: --inline-single - format-patch: rename "no_inline" field @@ -213,7 +290,7 @@ of the repositories listed at Waiting for a reroll after a review. -* jk/commit-info-slab (2013-04-13) 3 commits +* jk/commit-info-slab (2013-04-19) 3 commits - commit-slab: introduce a macro to define a slab for new type - commit-slab: avoid large realloc - commit: allow associating auxiliary info on-demand @@ -233,90 +310,83 @@ of the repositories listed at -------------------------------------------------- [Cooking] -* nd/pretty-formats (2013-04-17) 14 commits - - pretty: support %>> that steal trailing spaces - - pretty: support truncating in %>, %< and %>< - - pretty: support padding placeholders, %< %> and %>< - - SQUASH??? review comments (round #2) - - pretty: add %C(auto) for auto-coloring - - pretty: split color parsing into a separate function - - pretty: two phase conversion for non utf-8 commits - - utf8.c: add reencode_string_len() that can handle NULs in string - - utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences - - utf8.c: move display_mode_esc_sequence_len() for use by other functions - - pretty: share code between format_decoration and show_decorations - - pretty-formats.txt: wrap long lines - - pretty: get the correct encoding for --pretty:format=%e - - pretty: save commit encoding from logmsg_reencode if the caller needs it +* jc/prune-all (2013-04-18) 3 commits + (merged to 'next' on 2013-04-22 at b00ccf6) + + api-parse-options.txt: document "no-" for non-boolean options + + git-gc.txt, git-reflog.txt: document new expiry options + + date.c: add parse_expiry_date() - Looked sensible. + We used the approxidate() parser for "--expire=" options + of various commands, but it is better to treat --expire=all and + --expire=now a bit more specially than using the current timestamp. + Update "git gc" and "git reflog" with a new parsing function for + expiry dates. - Will merge to 'next' after waiting for further comments for a few days. + Will cook in 'next'. + + +* nd/pretty-formats (2013-04-18) 13 commits + (merged to 'next' on 2013-04-22 at 3d63014) + + pretty: support %>> that steal trailing spaces + + pretty: support truncating in %>, %< and %>< + + pretty: support padding placeholders, %< %> and %>< + + pretty: add %C(auto) for auto-coloring + + pretty: split color parsing into a separate function + + pretty: two phase conversion for non utf-8 commits + + utf8.c: add reencode_string_len() that can handle NULs in string + + utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences + + utf8.c: move display_mode_esc_sequence_len() for use by other functions + + pretty: share code between format_decoration and show_decorations + + pretty-formats.txt: wrap long lines + + pretty: get the correct encoding for --pretty:format=%e + + pretty: save commit encoding from logmsg_reencode if the caller needs it + + pretty-printing body of the commit that is stored in non UTF-8 + encoding did not work well. The early part of this series fixes + it. And then it adds %C(auto) specifier that turns the coloring on + when we are emitting to the terminal, and adds column-aligning + format directives. + + Will merge to 'master'. * kb/status-ignored-optim-2 (2013-04-15) 14 commits - - dir.c: git-status --ignored: don't scan the work tree twice - - dir.c: git-status --ignored: don't scan the work tree three times - - dir.c: git-status: avoid is_excluded checks for tracked files - - dir.c: replace is_path_excluded with now equivalent is_excluded API - - dir.c: unify is_excluded and is_path_excluded APIs - - dir.c: move prep_exclude - - dir.c: factor out parts of last_exclude_matching for later reuse - - dir.c: git-clean -d -X: don't delete tracked directories - - dir.c: make 'git-status --ignored' work within leading directories - - dir.c: git-status --ignored: don't list empty directories as ignored - - dir.c: git-ls-files --directories: don't hide empty directories - - dir.c: git-status --ignored: don't list empty ignored directories - - dir.c: git-status --ignored: don't list files in ignored directories - - dir.c: git-status --ignored: don't drop ignored directories + (merged to 'next' on 2013-04-21 at d2a5c70) + + dir.c: git-status --ignored: don't scan the work tree twice + + dir.c: git-status --ignored: don't scan the work tree three times + + dir.c: git-status: avoid is_excluded checks for tracked files + + dir.c: replace is_path_excluded with now equivalent is_excluded API + + dir.c: unify is_excluded and is_path_excluded APIs + + dir.c: move prep_exclude + + dir.c: factor out parts of last_exclude_matching for later reuse + + dir.c: git-clean -d -X: don't delete tracked directories + + dir.c: make 'git-status --ignored' work within leading directories + + dir.c: git-status --ignored: don't list empty directories as ignored + + dir.c: git-ls-files --directories: don't hide empty directories + + dir.c: git-status --ignored: don't list empty ignored directories + + dir.c: git-status --ignored: don't list files in ignored directories + + dir.c: git-status --ignored: don't drop ignored directories Rerolls kb/status-ignored-optim topic (reverted from 'next'). With help from Karsten, conflicts with as/check-ignore topic have been sorted out and it is now in 'pu'. - Will merge to 'next' after waiting for further comments for a few days. - - -* fc/branch-upstream-color (2013-04-15) 1 commit - (merged to 'next' on 2013-04-15 at 2fc50fd) - + branch: colour upstream branches - - Add more colors to "git branch -vv" output. - - Will merge to 'master'. - - -* lf/read-blob-data-from-index (2013-04-17) 3 commits - (merged to 'next' on 2013-04-17 at 611208f) - + convert.c: remove duplicate code - + read_blob_data_from_index(): optionally return the size of blob data - + attr.c: extract read_index_data() as read_blob_data_from_index() - - Reduce duplicated code between convert.c and attr.c. - - Will merge to 'master'. - - -* mv/ssl-ftp-curl (2013-04-12) 1 commit - (merged to 'next' on 2013-04-15 at 7fdada6) - + Support FTP-over-SSL/TLS for regular FTP - - Does anybody really use commit walkers over ftp??? - Will merge to 'master'. * as/check-ignore (2013-04-11) 5 commits - - Documentation: add caveats about I/O buffering for check-{attr,ignore} - - check-ignore: allow incremental streaming of queries via --stdin - - check-ignore: move setup into cmd_check_ignore() - - check-ignore: add -n / --non-matching option - - t0008: remove duplicated test fixture data + (merged to 'next' on 2013-04-21 at 7515aa8) + + Documentation: add caveats about I/O buffering for check-{attr,ignore} + + check-ignore: allow incremental streaming of queries via --stdin + + check-ignore: move setup into cmd_check_ignore() + + check-ignore: add -n / --non-matching option + + t0008: remove duplicated test fixture data Enhance "check-ignore" (1.8.2 update) to work more like "check-attr" over bidi-pipes. - Will merge to 'next' after waiting for further comments for a few days. + Will cook in 'next'. + The test in the second from the tip needs to be updated. * mh/packed-refs-various (2013-04-15) 33 commits @@ -357,192 +427,78 @@ of the repositories listed at Updates reading and updating packed-refs file, correcting corner case bugs. + Waiting for comments. + * jk/remote-helper-with-signed-tags (2013-04-15) 3 commits - - transport-helper: add 'signed-tags' capability - - transport-helper: pass --signed-tags=warn-strip to fast-export - - fast-export: add --signed-tags=warn-strip mode + (merged to 'next' on 2013-04-21 at 0231d45) + + transport-helper: add 'signed-tags' capability + + transport-helper: pass --signed-tags=warn-strip to fast-export + + fast-export: add --signed-tags=warn-strip mode Allows remote-helpers to declare they can handle signed tags, and issue a warning when using those that don't. - Will merge to 'next' after waiting for further comments for a few days. + Will merge to 'master'. * jn/gitweb-install-doc (2013-04-17) 2 commits - - gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility - - gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM + (merged to 'next' on 2013-04-22 at a5d4812) + + gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility + + gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM Reword gitweb configuration instrutions. - Will merge to 'next' after waiting for further comments for a few days. - - -* jx/i18n-branch-error-messages (2013-04-15) 1 commit - (merged to 'next' on 2013-04-18 at 630c211) - + i18n: branch: mark strings for translation - Will merge to 'master'. -* nd/checkout-keep-sparse (2013-04-15) 1 commit - - checkout: add --ignore-skip-worktree-bits in sparse checkout mode - - Make the initial "sparse" selection of the paths more sticky across - "git checkout". - - Will merge to 'next'. - - -* ta/glossary (2013-04-15) 4 commits - - glossary: improve definitions of refspec and pathspec - - The name of the hash function is "SHA-1", not "SHA1" - - glossary: improve description of SHA-1 related topics - - glossary: remove outdated/misleading/irrelevant entries - - Will merge to 'next'. - - -* th/bisect-final-log (2013-04-15) 1 commit - - bisect: Store first bad commit as comment in log file - - Will merge to 'next'. - - -* ap/strbuf-humanize (2013-04-10) 2 commits - (merged to 'next' on 2013-04-14 at 66d7af5) - + count-objects: add -H option to humanize sizes - + strbuf: create strbuf_humanise_bytes() to show byte sizes - - Teach "--human-readable" aka "-H" option to "git count-objects" to - show various large numbers in Ki/Mi/GiB scaled as necessary. - - I've decided to let this topic supersede mc/count-objects-kibibytes. - Human users will get an even easier output with "-H" and by not - changing the output without an explicit option we do not have to - break third-party tools that may have been reading from the output - of this command. - - Will merge to 'master'. - - -* as/clone-reference-with-gitfile (2013-04-09) 2 commits - (merged to 'next' on 2013-04-15 at ab0d128) - + clone: Allow repo using gitfile as a reference - + clone: Fix error message for reference repository - - "git clone" did not work if a repository pointed at by the - "--reference" option is a gitfile that points at another place. - - Will merge to 'master' after eyeballing it once again. - - * fc/transport-helper-error-reporting (2013-04-17) 9 commits - - transport-helper: update remote helper namespace - - transport-helper: trivial code shuffle - - transport-helper: warn when refspec is not used - - transport-helper: clarify pushing without refspecs - - transport-helper: update refspec documentation - - transport-helper: clarify *:* refspec - - transport-helper: improve push messages - - transport-helper: mention helper name when it dies - - transport-helper: report errors properly - - Rerolled with much more clarifications than before. - - Will merge to 'next' after waiting for further comments for a few days. - + (merged to 'next' on 2013-04-22 at 5ba6467) + + transport-helper: update remote helper namespace + + transport-helper: trivial code shuffle + + transport-helper: warn when refspec is not used + + transport-helper: clarify pushing without refspecs + + transport-helper: update refspec documentation + + transport-helper: clarify *:* refspec + + transport-helper: improve push messages + + transport-helper: mention helper name when it dies + + transport-helper: report errors properly + + Update transport helper to report errors and maintain ref hierarchy + used to keep track of remote helper state better. -* jk/doc-http-backend (2013-04-13) 3 commits - - doc/http-backend: match query-string in apache half-auth example - - doc/http-backend: give some lighttpd config examples - - doc/http-backend: clarify "half-auth" repo configuration - - Improve documentation to illustrate "push authenticated, fetch - anonymous" configuration for smart HTTP servers. - - Will merge to 'next'. + Will merge to 'master'. -* jk/submodule-subdirectory-ok (2013-04-10) 2 commits - - submodule: drop the top-level requirement - - rev-parse: add --prefix option +* jk/submodule-subdirectory-ok (2013-04-18) 2 commits + (merged to 'next' on 2013-04-22 at f211e25) + + submodule: drop the top-level requirement + + rev-parse: add --prefix option Allow various subcommands of "git submodule" to be run not from the top of the working tree of the superproject. - Worthy goal, but not quite there yet. - $gmane/221575 - - -* mv/sequencer-pick-error-diag (2013-04-11) 1 commit - (merged to 'next' on 2013-04-16 at a2da926) - + cherry-pick: make sure all input objects are commits - - "git cherry-pick $blob $tree" is diagnosed as a nonsense. - - Will merge to 'master' with the 'tr/copy-revisions-from-stdin' topic. - - -* fc/remote-hg (2013-04-11) 21 commits - (merged to 'next' on 2013-04-16 at cbeaf41) - + remote-hg: activate graphlog extension for hg_log() - + remote-hg: fix bad file paths - + remote-hg: document location of stored hg repository - + remote-hg: fix bad state issue - + remote-hg: add 'insecure' option - + remote-hg: add simple mail test - + remote-hg: add basic author tests - + remote-hg: show more proper errors - + remote-hg: force remote push - + remote-hg: push to the appropriate branch - + remote-hg: update tags globally - + remote-hg: update remote bookmarks - + remote-hg: refactor export - + remote-hg: split bookmark handling - + remote-hg: redirect buggy mercurial output - + remote-hg: trivial test cleanups - + remote-hg: make sure fake bookmarks are updated - + remote-hg: fix for files with spaces - + remote-hg: properly report errors on bookmark pushes - + remote-hg: add missing config variable in doc - + remote-hg: trivial cleanups - - Updates remote-hg helper (in contrib/). - - Will merge to 'master'. + Will cook in 'next'. * jl/submodule-mv (2013-04-11) 4 commits - - rm: delete .gitmodules entry of submodules removed from the work tree - - Teach mv to update the path entry in .gitmodules for moved submodules - - Teach mv to move submodules using a gitfile - - Teach mv to move submodules together with their work trees + (merged to 'next' on 2013-04-19 at 45ae3c9) + + rm: delete .gitmodules entry of submodules removed from the work tree + + Teach mv to update the path entry in .gitmodules for moved submodules + + Teach mv to move submodules using a gitfile + + Teach mv to move submodules together with their work trees "git mv A B" when moving a submodule A does "the right thing", inclusing relocating its working tree and adjusting the paths in the .gitmodules file. - Will merge to 'next'. + Will cook in 'next'. -* jn/add-2.0-u-A-sans-pathspec (2013-04-03) 6 commits +* jn/add-2.0-u-A-sans-pathspec (2013-04-03) 1 commit - git add: -u/-A now affects the entire working tree - (merged to 'next' on 2013-04-05 at eae93ef) - + add -A: only show pathless 'add -A' warning when changes exist outside cwd - + add -u: only show pathless 'add -u' warning when changes exist outside cwd - + add: make warn_pathless_add() a no-op after first call - + add: add a blank line at the end of pathless 'add [-u|-A]' warning - + add: make pathless 'add [-u|-A]' warning a file-global function - "git add -u/-A" without any pathspec traditionally limited its - operation to the current directory when run from a subdirectory, - but in Git 2.0, they will affect the entire working tree. Start - training users to explicitly say "." or ":/" to smooth out the - transition hump with the earlier parts of this series, and flip the - default as the final step. - - Will merge to 'master' the early bits and cook the rest in 'next' until Git 2.0. + Will cook in 'next' until Git 2.0. * nd/magic-pathspecs (2013-03-31) 45 commits @@ -597,31 +553,11 @@ of the repositories listed at Will be rerolled. -* jc/add-2.0-delete-default (2013-04-17) 4 commits - - git add ... defaults to "-A" - - git add: rework the logic to warn "git add ..." default change - (merged to 'next' on 2013-04-05 at 199442e) - + git add: start preparing for "git add ..." to default to "-A" - + builtin/add.c: simplify boolean variables - - In Git 2.0, "git add pathspec" will mean "git add -A pathspec". If - you did this in a working tree that tracks dir/lost and dir/another: - - $ rm dir/lost - $ edit dir/another - $ git add dir - - The last step will not only notices and records updated - dir/another, but also notices and records the removal of dir/lost - in the index. - - Start training the users for this change to say --no-all when they - want to ignore the removal to smooth the transition hump. - - Will merge to 'master' the early bits and cook the tip one in 'next' until Git 2.0. - - -* tr/line-log (2013-04-12) 11 commits +* tr/line-log (2013-04-22) 13 commits + (merged to 'next' on 2013-04-22 at 8f2c1de) + + git-log(1): remove --full-line-diff description + (merged to 'next' on 2013-04-21 at cd92620) + + line-log: fix documentation formatting (merged to 'next' on 2013-04-15 at 504559e) + log -L: improve comments in process_all_files() + log -L: store the path instead of a diff_filespec @@ -637,6 +573,8 @@ of the repositories listed at + Export rewrite_parents() for 'log -L' + Refactor parse_loc + Will cook in 'next'. + * jc/push-2.0-default-to-simple (2013-04-03) 1 commit - push: switch default from "matching" to "simple" @@ -644,3 +582,10 @@ of the repositories listed at The early bits to adjust the tests have been merged to 'master'. Will cook in 'next' until Git 2.0. + + +* jc/add-2.0-delete-default (2013-04-21) 1 commit + - git add ... defaults to "-A" + + Will cook in 'next' until Git 2.0. + -- 2.11.4.GIT