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
--------------------------------------------------
[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
In addition to a user visible change to offer more options to
cherry-pick, generally cleans up and simplifies the code.
* 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.
* 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.
* jk/daemon-user-doc (2013-04-12) 1 commit
(merged to 'next' on 2013-04-14 at 56c08ff)
+ doc: clarify that "git daemon --user=<user>" option does not export
HOME=~user
Document where the configuration is read by the git-daemon when its
--user option is used.
* 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/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/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/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=<there>
option.
* 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
Update the informational message when "git checkout" leaves the
detached head state.
* 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
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.
* 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
* 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.
--------------------------------------------------
[New Topics]
* 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.
Will fast-track to 'master'.
* 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').
Will merge to 'master'.
* 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()
We used the approxidate() parser for "--expire=<timestamp>" 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/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"
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 merge to 'next'.
* 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
A test fix for recent update.
Will fast-track to 'master'.
--------------------------------------------------
[Stalled]
* jc/format-patch (2013-02-21) 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.
Not ready for inclusion.
* 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.
Waiting for a reroll after a review.
* jk/commit-info-slab (2013-04-13) 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
Technology demonstration to show a way we could use unbound number
of flag bits on commit objects.
* jn/config-ignore-inaccessible (2013-04-15) 1 commit
- config: allow inaccessible configuration under $HOME
When $HOME is misconfigured to point at an unreadable directory, we
used to complain and die. This loosens the check.
I do not think we agreed that this is a good idea, though.
--------------------------------------------------
[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
Looked sensible.
Will merge to 'next' after waiting for further comments for a few days.
* 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
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
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.
* mh/packed-refs-various (2013-04-15) 33 commits
- refs: handle the main ref_cache specially
- refs: change do_for_each_*() functions to take ref_cache arguments
- pack_one_ref(): do some cheap tests before a more expensive one
- pack_one_ref(): use write_packed_entry() to do the writing
- pack_one_ref(): use function peel_entry()
- refs: inline function do_not_prune()
- pack_refs(): change to use do_for_each_entry()
- refs: use same lock_file object for both ref-packing functions
- pack_one_ref(): rename "path" parameter to "refname"
- pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
- pack-refs: rename handle_one_ref() to pack_one_ref()
- refs: extract a function write_packed_entry()
- repack_without_ref(): write peeled refs in the rewritten file
- t3211: demonstrate loss of peeled refs if a packed ref is deleted
- refs: change how packed refs are deleted
- search_ref_dir(): return an index rather than a pointer
- repack_without_ref(): silence errors for dangling packed refs
- t3210: test for spurious error messages for dangling packed refs
- refs: change the internal reference-iteration API
- refs: extract a function peel_entry()
- peel_ref(): fix return value for non-peelable, not-current reference
- peel_object(): give more specific information in return value
- refs: extract function peel_object()
- refs: extract a function ref_resolves_to_object()
- repack_without_ref(): use function get_packed_ref()
- peel_ref(): use function get_packed_ref()
- get_packed_ref(): return a ref_entry
- do_for_each_ref_in_dirs(): remove dead code
- refs: define constant PEELED_LINE_LENGTH
- refs: document how current_ref is used
- refs: document do_for_each_ref() and do_one_ref()
- refs: document the fields of struct ref_value
- refs: document flags constants REF_*
Updates reading and updating packed-refs file, correcting corner
case bugs.
* 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
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.
* 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
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.
* 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'.
* jk/submodule-subdirectory-ok (2013-04-10) 2 commits
- 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'.
* 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
"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'.
* jn/add-2.0-u-A-sans-pathspec (2013-04-03) 6 commits
- 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.
* nd/magic-pathspecs (2013-03-31) 45 commits
. Rename field "raw" to "_raw" in struct pathspec
. pathspec: support :(glob) syntax
. pathspec: make --literal-pathspecs disable pathspec magic
. pathspec: support :(literal) syntax for noglob pathspec
. Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
. parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
. parse_pathspec: make sure the prefix part is wildcard-free
. tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
. Remove match_pathspec() in favor of match_pathspec_depth()
. Remove init_pathspec() in favor of parse_pathspec()
. Remove diff_tree_{setup,release}_paths
. Convert common_prefix() to use struct pathspec
. Convert add_files_to_cache to take struct pathspec
. Convert {read,fill}_directory to take struct pathspec
. Convert refresh_index to take struct pathspec
. Convert report_path_error to take struct pathspec
. checkout: convert read_tree_some to take struct pathspec
. Convert unmerge_cache to take struct pathspec
. Convert run_add_interactive to use struct pathspec
. Convert read_cache_preload() to take struct pathspec
. reset: convert to use parse_pathspec
. add: convert to use parse_pathspec
. check-ignore: convert to use parse_pathspec
. archive: convert to use parse_pathspec
. ls-files: convert to use parse_pathspec
. rm: convert to use parse_pathspec
. checkout: convert to use parse_pathspec
. rerere: convert to use parse_pathspec
. status: convert to use parse_pathspec
. commit: convert to use parse_pathspec
. clean: convert to use parse_pathspec
. Guard against new pathspec magic in pathspec matching code
. parse_pathspec: support prefixing original patterns
. parse_pathspec: support stripping/checking submodule paths
. parse_pathspec: support stripping submodule trailing slashes
. parse_pathspec: a special flag for max_depth feature
. Convert some get_pathspec() calls to parse_pathspec()
. parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}
. parse_pathspec: save original pathspec for reporting
. Add parse_pathspec() that converts cmdline args to struct pathspec
. pathspec: add copy_pathspec
. pathspec: i18n-ize error strings in pathspec parsing code
. Move struct pathspec and related functions to pathspec.[ch]
. clean: remove unused variable "seen"
. setup.c: check that the pathspec magic ends with ")"
Migrate the rest of codebase to use "struct pathspec" more.
Will be rerolled.
* jc/add-2.0-delete-default (2013-04-17) 4 commits
- git add <pathspec>... defaults to "-A"
- git add: rework the logic to warn "git add <pathspec>..." default change
(merged to 'next' on 2013-04-05 at 199442e)
+ git add: start preparing for "git add <pathspec>..." 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
(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
+ log -L: test merge of parallel modify/rename
+ t4211: pass -M to 'git log -M -L...' test
(merged to 'next' on 2013-04-05 at 5afb00c)
+ log -L: fix overlapping input ranges
+ log -L: check range set invariants when we look it up
(merged to 'next' on 2013-04-01 at 5be920c)
+ Speed up log -L... -M
+ log -L: :pattern:file syntax to find by funcname
+ Implement line-history search (git log -L)
+ Export rewrite_parents() for 'log -L'
+ Refactor parse_loc
* jc/push-2.0-default-to-simple (2013-04-03) 1 commit
- push: switch default from "matching" to "simple"
The early bits to adjust the tests have been merged to 'master'.
Will cook in 'next' until Git 2.0.
--
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
