@ -1,9 +1,9 @@
@@ -1,9 +1,9 @@
To: git@vger.kernel.org
Subject: What's cooking in git.git (Nov 2010, #02; Wed, 17)
X-master-at: 03276d94bcdb7d463a029936933898948c0669ac
X-next-at: ec7d70969ee62009146d3636340c5e7023f24ff9
Subject: What's cooking in git.git (Nov 2010, #03; Wed, 24)
X-master-at: 7d43de925b2771d295d8fc4341b7bd544e2a74fa
X-next-at: 03864edeab230c99aac705ab795ed9e8b63cc7d3
What's cooking in git.git (Nov 2010, #02; Wed, 17)
What's cooking in git.git (Nov 2010, #03; Wed, 24)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
@ -12,208 +12,157 @@ marked with '.' do not appear in any of the integration branches, but I am
@@ -12,208 +12,157 @@ marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
--------------------------------------------------
[Graduated to "master"]
[New Topics]
* ak/submodule-sync (2010-10-08) 1 commit
(merged to 'next' on 2010-11-05 at 5a2f940)
+ submodule sync: Update "submodule.<name>.url" for empty directories
* bg/maint-gitweb-test-lib (2010-10-20) 1 commit
(merged to 'next' on 2010-11-05 at 0ead869)
+ t/gitweb-lib: Don't pass constant to decode_utf8
* cb/diff-fname-optim (2010-09-26) 3 commits
(merged to 'next' on 2010-11-05 at b3b09f3)
+ diff: avoid repeated scanning while looking for funcname
+ do not search functions for patch ID
+ add rebase patch id tests
* dk/maint-blame-el (2010-05-25) 1 commit
(merged to 'next' on 2010-11-05 at 8456c66)
+ git-blame.el: Add (require 'format-spec)
* jk/maint-apply-no-binary (2010-10-18) 1 commit
(merged to 'next' on 2010-11-05 at 8b7543a)
+ apply: don't segfault on binary files with missing data
* jk/maint-rev-list-nul (2010-10-07) 1 commit
(merged to 'next' on 2010-11-05 at 406cba1)
+ rev-list: handle %x00 NUL in user format
* jk/missing-config (2010-10-21) 1 commit
(merged to 'next' on 2010-11-05 at 31fda69)
+ config: treat non-existent config files as empty
* jk/no-textconv-symlink (2010-09-21) 1 commit
(merged to 'next' on 2010-11-05 at 0a99e75)
+ diff: don't use pathname-based diff drivers for symlinks
(this branch is used by ks/no-textconv-symlink.)
* jk/push-progress (2010-10-17) 8 commits
(merged to 'next' on 2010-11-05 at 9207c6d)
+ push: pass --progress down to git-pack-objects
+ t5523-push-upstream: test progress messages
+ t5523-push-upstream: add function to ensure fresh upstream repo
+ test_terminal: ensure redirections work reliably
+ test_terminal: catch use without TTY prerequisite
+ test-lib: allow test code to check the list of declared prerequisites
+ tests: test terminal output to both stdout and stderr
+ tests: factor out terminal handling from t7006
* jl/maint-pull-tags-doc (2010-11-03) 1 commit
(merged to 'next' on 2010-11-05 at 861d16a)
+ pull: Remove --tags option from manpage
* jm/mailmap (2010-10-19) 3 commits
(merged to 'next' on 2010-11-05 at ef1e754)
+ t4203: do not let "git shortlog" DWIM based on tty
+ t4203 (mailmap): stop hardcoding commit ids and dates
+ mailmap: fix use of freed memory
* jn/gitweb-test (2010-09-26) 4 commits
(merged to 'next' on 2010-11-05 at 90b3adf)
+ gitweb/Makefile: Include gitweb/config.mak
+ gitweb/Makefile: Add 'test' and 'test-installed' targets
+ t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
+ gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
(this branch is used by jh/gitweb-caching.)
* jn/send-pack-error (2010-10-16) 1 commit
(merged to 'next' on 2010-11-05 at ef559d4)
+ send-pack: avoid redundant "pack-objects died with strange error"
* kb/completion-checkout (2010-10-12) 1 commit
(merged to 'next' on 2010-11-05 at 6836d70)
+ completion: Support the DWIM mode for git checkout
* kb/maint-diff-ws-check (2010-10-20) 2 commits
(merged to 'next' on 2010-11-05 at 861b5ac)
+ diff: handle lines containing only whitespace and tabs better
+ test-lib: extend test_decode_color to handle more color codes
* kb/maint-submodule-savearg (2010-11-02) 2 commits
(merged to 'next' on 2010-11-05 at 10e1aeb)
+ submodule: only preserve flags across recursive status/update invocations
+ submodule: preserve all arguments exactly when recursing
* ks/no-textconv-symlink (2010-09-29) 3 commits
(merged to 'next' on 2010-11-05 at 32f0580)
+ blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
+ blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
+ blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
(this branch uses jk/no-textconv-symlink.)
* mg/make-prove (2010-10-14) 1 commit
(merged to 'next' on 2010-11-05 at ec4f806)
+ test: allow running the tests under "prove"
* sg/bisect (2010-10-10) 3 commits
(merged to 'next' on 2010-11-05 at 4a8b88d)
+ bisect: check for mandatory argument of 'bisect replay'
+ bisect: improve error msg of 'bisect reset' when original HEAD is deleted
+ bisect: improve error message of 'bisect log' while not bisecting
* sg/completion (2010-10-11) 4 commits
(merged to 'next' on 2010-11-05 at 4967932)
+ bash: support pretty format aliases
+ bash: support more 'git notes' subcommands and their options
+ bash: not all 'git bisect' subcommands make sense when not bisecting
+ bash: offer refs for 'git bisect start'
* tr/maint-git-repack-tmpfile (2010-10-19) 1 commit
(merged to 'next' on 2010-11-05 at 80ad03a)
+ repack: place temporary packs under .git/objects/pack/
* tr/maint-merge-file-subdir (2010-10-17) 2 commits
(merged to 'next' on 2010-11-05 at a2873a4)
+ merge-file: correctly find files when called in subdir
+ prefix_filename(): safely handle the case where pfx_len=0
* ef/win32-dirent (2010-11-23) 6 commits
- win32: use our own dirent.h
- msvc: opendir: handle paths ending with a slash
- win32: dirent: handle errors
- msvc: opendir: do not start the search
- msvc: opendir: allocate enough memory
- msvc: opendir: fix malloc-failure
* jk/asciidoc-update (2010-11-19) 1 commit
- docs: default to more modern toolset
* jk/maint-reflog-bottom (2010-11-21) 1 commit
- reflogs: clear flags properly in corner case
* jn/fast-import-ondemand-checkpoint (2010-11-22) 1 commit
- fast-import: treat SIGUSR1 as a request to access objects early
* jn/maint-fast-import-object-reuse (2010-11-23) 1 commit
- fast-import: insert new object entries at start of hash bucket
* jn/maint-svn-fe (2010-10-10) 1 commit
- t9010 (svn-fe): Eliminate dependency on svn perl bindings
* jn/svn-fe (2010-11-19) 17 commits
- vcs-svn: Implement Prop-delta handling
- vcs-svn: Sharpen parsing of property lines
- vcs-svn: Split off function for handling of individual properties
- vcs-svn: Make source easier to read on small screens
- vcs-svn: More dump format sanity checks
- vcs-svn: Reject path nodes without Node-action
- vcs-svn: Delay read of per-path properties
- vcs-svn: Combine repo_replace and repo_modify functions
- vcs-svn: Replace = Delete + Add
- vcs-svn: handle_node: Handle deletion case early
- vcs-svn: Use mark to indicate nodes with included text
- vcs-svn: Unclutter handle_node by introducing have_props var
- vcs-svn: Eliminate node_ctx.mark global
- vcs-svn: Eliminate node_ctx.srcRev global
- vcs-svn: Check for errors from open()
- vcs-svn: Allow simple v3 dumps (no deltas yet)
- vcs-svn: Error out for v3 dumps
Some RFC patches, to give them early and wider exposure.
* mz/rebase-abort-reflog-fix (2010-11-21) 1 commit
- rebase --abort: do not update branch ref
* mz/rebase-i-verify (2010-11-22) 1 commit
- rebase: support --verify
* nd/maint-relative (2010-11-20) 1 commit
- get_cwd_relative(): do not misinterpret root path
* tc/format-patch-p (2010-11-23) 1 commit
- format-patch: page output with --stdout
* tc/http-urls-ends-with-slash (2010-11-22) 7 commits
- http-push: add trailing slash at arg-parse time, instead of later on
- http-push: check path length before using it
- http-push: Normalise directory names when pushing to some WebDAV servers
- http-backend: use end_url_with_slash()
- url: add str wrapper for end_url_with_slash()
- shift end_url_with_slash() from http.[ch] to url.[ch]
- t5550-http-fetch: add missing '&&'
--------------------------------------------------
[New Topics]
[Graduated to "master"]
* ao/send-email-irt (2010-11-12) 2 commits
(merged to 'next' on 2010-11-15 at 257c77a)
+ git-send-email.perl: make initial In-Reply-To apply only to first email
(merged to 'next' on 2010-11-08 at d103166)
+ t9001: send-email interation with --in-reply-to and --chain-reply-to
* cb/maint-orphan-merge-noclobber (2010-11-14) 1 commit
(merged to 'next' on 2010-11-15 at 046c5e5)
+ do not overwrite untracked during merge from unborn branch
Will merge to master soonish.
* gb/gitweb-remote-heads (2010-11-11) 11 commits
- git instaweb: enable remote_heads
- gitweb: group remote heads by remote
- gitweb: provide a routine to display (sub)sections
- gitweb: refactor repository URL printing
- gitweb: remotes view for a single remote
- gitweb: allow action specialization in page header
- gitweb: nagivation menu for tags, heads and remotes
- gitweb: separate heads and remotes lists
- gitweb: git_get_heads_list accepts an optional list of refs
- gitweb: introduce remote_heads feature
- gitweb: use fullname as hash_base in heads link
Acked by Jakub. Will merge to next.
* gc/http-with-non-ascii-username-url (2010-11-14) 2 commits
- Fix username and password extraction from HTTP URLs
- t5550: test HTTP authentication and userinfo decoding
Acked by Tay. Will merge to next.
* jk/maint-decorate-01-bool (2010-11-17) 1 commit
- log.decorate: accept 0/1 bool values
(this branch is used by jk/pager-per-command.)
Looked reasonable. Will merge to next.
* jk/pager-per-command (2010-11-17) 1 commit
- allow command-specific pagers in pager.<cmd>
(this branch uses jk/maint-decorate-01-bool.)
Looked reasonable. Will merge to next.
* jn/getenv-poison (2010-11-12) 1 commit
. add GETENV_POISON option to simulate unfriendly getenv()
(this branch uses ks/maint-getenv-fix.)
* jn/gitweb-time-hires-comes-with-5.8 (2010-11-09) 1 commit
- gitweb: Time::HiRes is in core for Perl 5.8
Looked reasonable. Will merge to next.
* jn/ignore-doc (2010-11-10) 2 commits
- Documentation: point to related commands from gitignore
- Documentation: split gitignore page into sections
Looked reasonable. Will merge to next.
* jn/thinner-wrapper (2010-11-06) 7 commits
- Remove pack file handling dependency from wrapper.o
- pack-objects: mark file-local variable static
- wrapper: give zlib wrappers their own translation unit
- strbuf: move strbuf_branchname to sha1_name.c
- path helpers: move git_mkstemp* to wrapper.c
- wrapper: move odb_* to environment.c
- wrapper: move xmmap() to sha1_file.c
Looked reasonable. Will merge to next.
* ks/maint-getenv-fix (2010-11-11) 1 commit
- setup: make sure git_dir path is in a permanent buffer, getenv(3) case
(this branch is used by jn/getenv-poison.)
Looked reasonable. Will merge to next.
* ef/mingw-daemon (2010-11-04) 16 commits
(merged to 'next' on 2010-11-17 at 4a295c7)
+ daemon: opt-out on features that require posix
+ daemon: make --inetd and --detach incompatible
+ daemon: use socklen_t
+ mingw: use poll-emulation from gnulib
+ mingw: import poll-emulation from gnulib
+ daemon: get remote host address from root-process
+ Improve the mingw getaddrinfo stub to handle more use cases
+ daemon: use full buffered mode for stderr
+ daemon: use run-command api for async serving
+ mingw: add kill emulation
+ mingw: support waitpid with pid > 0 and WNOHANG
+ mingw: use real pid
+ inet_ntop: fix a couple of old-style decls
+ compat: add inet_pton and inet_ntop prototypes
+ mingw: implement syslog
+ mingw: add network-wrappers for daemon
* nd/extended-sha1-relpath (2010-11-11) 2 commits
- get_sha1: support relative path ":path" syntax
- Make prefix_path() return char* without const
(this branch uses jn/parse-options-extra.)
* en/and-cascade-tests (2010-10-31) 25 commits
(merged to 'next' on 2010-11-15 at d51ec77)
+ t4124 (apply --whitespace): use test_might_fail
+ t3404: do not use 'describe' to implement test_cmp_rev
+ t3404 (rebase -i): introduce helper to check position of HEAD
+ t3404 (rebase -i): move comment to description
+ t3404 (rebase -i): unroll test_commit loops
+ t3301 (notes): use test_expect_code for clarity
+ t1400 (update-ref): use test_must_fail
+ t1502 (rev-parse --parseopt): test exit code from "-h"
+ t6022 (renaming merge): chain test commands with &&
+ test-lib: introduce test_line_count to measure files
+ tests: add missing &&, batch 2
+ tests: add missing &&
+ Introduce sane_unset and use it to ensure proper && chaining
+ t7800 (difftool): add missing &&
+ t7601 (merge-pull-config): add missing &&
+ t7001 (mv): add missing &&
+ t6016 (rev-list-graph-simplify-history): add missing &&
+ t5602 (clone-remote-exec): add missing &&
+ t4026 (color): remove unneeded and unchained command
+ t4019 (diff-wserror): add lots of missing &&
+ t4202 (log): Replace '<git-command> || :' with test_might_fail
+ t4002 (diff-basic): use test_might_fail for commands that might fail
+ t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
+ t4017 (diff-retval): replace manual exit code check with test_expect_code
+ test-lib: make test_expect_code a test command
(this branch is used by jn/git-cmd-h-bypass-setup.)
Perhaps needs a documentation update.
* jk/add-e-doc (2010-11-08) 2 commits
(merged to 'next' on 2010-11-15 at e971401)
+ docs: give more hints about how "add -e" works
(merged to 'next' on 2010-11-05 at 389fee7)
+ docs: give more hints about how "add -e" works
* nd/maint-fix-add-typo-detection (2010-11-11) 1 commit
- add: do not rely on dtype being NULL behavior
* kb/maint-rebase-autosquash (2010-11-04) 2 commits
(merged to 'next' on 2010-11-15 at 9b8c830)
+ rebase: teach --autosquash to match on sha1 in addition to message
+ rebase: better rearranging of fixup!/squash! lines with --autosquash
Looked reasonable. Will merge to next.
* mm/phrase-remote-tracking (2010-11-02) 10 commits
(merged to 'next' on 2010-11-15 at 07d67f4)
+ git-branch.txt: mention --set-upstream as a way to change upstream configuration
+ user-manual: remote-tracking can be checked out, with detached HEAD
+ user-manual.txt: explain better the remote(-tracking) branch terms
+ Change incorrect "remote branch" to "remote tracking branch" in C code
+ Change incorrect uses of "remote branch" meaning "remote-tracking"
+ Change "tracking branch" to "remote-tracking branch"
+ everyday.txt: change "tracking branch" to "remote-tracking branch"
+ Change remote tracking to remote-tracking in non-trivial places
+ Replace "remote tracking" with "remote-tracking"
+ Better "Changed but not updated" message in git-status
* rs/opt-help-text (2010-11-08) 8 commits
(merged to 'next' on 2010-11-15 at 631c222)
@ -226,8 +175,6 @@ Looked reasonable. Will merge to next.
@@ -226,8 +175,6 @@ Looked reasonable. Will merge to next.
+ add description parameter to OPT__DRY_RUN
+ add description parameter to OPT__VERBOSE
Will merge to master soonish.
--------------------------------------------------
[Stalled]
@ -258,15 +205,6 @@ flags needs to be rethought, or at least the helper needs to be moved to
@@ -258,15 +205,6 @@ flags needs to be rethought, or at least the helper needs to be moved to
builtin/tag.c to make it clear that it should not be used outside the
current usage context.
* jh/gitweb-caching (2010-11-01) 4 commits
. gitweb: Minimal testing of gitweb caching
. gitweb: File based caching layer (from git.kernel.org)
. gitweb: add output buffering and associated functions
. gitweb: Prepare for splitting gitweb
Temporarily ejected while I shuffled jn/gitweb-testing; will queue the
latest back in pu or perhaps in next.
* tr/config-doc (2010-10-24) 2 commits
. Documentation: complete config list from other manpages
. Documentation: Move variables from config.txt to separate file
@ -276,29 +214,81 @@ This unfortunately heavily conflicts with patches in flight...
@@ -276,29 +214,81 @@ This unfortunately heavily conflicts with patches in flight...
--------------------------------------------------
[Cooking]
* ef/mingw-daemon (2010-11-04) 16 commits
(merged to 'next' on 2010-11-17 at 4a295c7)
+ daemon: opt-out on features that require posix
+ daemon: make --inetd and --detach incompatible
+ daemon: use socklen_t
+ mingw: use poll-emulation from gnulib
+ mingw: import poll-emulation from gnulib
+ daemon: get remote host address from root-process
+ Improve the mingw getaddrinfo stub to handle more use cases
+ daemon: use full buffered mode for stderr
+ daemon: use run-command api for async serving
+ mingw: add kill emulation
+ mingw: support waitpid with pid > 0 and WNOHANG
+ mingw: use real pid
+ inet_ntop: fix a couple of old-style decls
+ compat: add inet_pton and inet_ntop prototypes
+ mingw: implement syslog
+ mingw: add network-wrappers for daemon
* gb/gitweb-remote-heads (2010-11-11) 11 commits
(merged to 'next' on 2010-11-24 at 6fb4a6f)
+ git instaweb: enable remote_heads
+ gitweb: group remote heads by remote
+ gitweb: provide a routine to display (sub)sections
+ gitweb: refactor repository URL printing
+ gitweb: remotes view for a single remote
+ gitweb: allow action specialization in page header
+ gitweb: nagivation menu for tags, heads and remotes
+ gitweb: separate heads and remotes lists
+ gitweb: git_get_heads_list accepts an optional list of refs
+ gitweb: introduce remote_heads feature
+ gitweb: use fullname as hash_base in heads link
* jc/abbrev-guard (2010-10-28) 1 commit
- core.abbrevguard: Ensure short object names stay unique a bit longer
* gc/http-with-non-ascii-username-url (2010-11-14) 2 commits
(merged to 'next' on 2010-11-24 at 08f317f)
+ Fix username and password extraction from HTTP URLs
+ t5550: test HTTP authentication and userinfo decoding
* jk/maint-decorate-01-bool (2010-11-17) 1 commit
(merged to 'next' on 2010-11-24 at 347f73b)
+ log.decorate: accept 0/1 bool values
(this branch is used by jk/pager-per-command.)
* jk/pager-per-command (2010-11-17) 1 commit
(merged to 'next' on 2010-11-24 at 9ebcffc)
+ allow command-specific pagers in pager.<cmd>
(this branch uses jk/maint-decorate-01-bool.)
Will merge to next.
* jn/getenv-poison (2010-11-12) 1 commit
. add GETENV_POISON option to simulate unfriendly getenv()
(this branch uses ks/maint-getenv-fix.)
* jn/gitweb-time-hires-comes-with-5.8 (2010-11-09) 1 commit
(merged to 'next' on 2010-11-24 at 6b91b41)
+ gitweb: Time::HiRes is in core for Perl 5.8
* jn/ignore-doc (2010-11-10) 2 commits
(merged to 'next' on 2010-11-24 at c0a9730)
+ Documentation: point to related commands from gitignore
+ Documentation: split gitignore page into sections
* jn/thinner-wrapper (2010-11-06) 7 commits
(merged to 'next' on 2010-11-24 at 3f2227d)
+ Remove pack file handling dependency from wrapper.o
+ pack-objects: mark file-local variable static
+ wrapper: give zlib wrappers their own translation unit
+ strbuf: move strbuf_branchname to sha1_name.c
+ path helpers: move git_mkstemp* to wrapper.c
+ wrapper: move odb_* to environment.c
+ wrapper: move xmmap() to sha1_file.c
* ks/maint-getenv-fix (2010-11-11) 1 commit
(merged to 'next' on 2010-11-24 at fa89826)
+ setup: make sure git_dir path is in a permanent buffer, getenv(3) case
(this branch is used by jn/getenv-poison.)
* nd/extended-sha1-relpath (2010-11-11) 2 commits
- get_sha1: support relative path ":path" syntax
- Make prefix_path() return char* without const
(this branch uses jn/parse-options-extra.)
* nd/maint-fix-add-typo-detection (2010-11-11) 1 commit
(merged to 'next' on 2010-11-24 at 6832306)
+ add: do not rely on dtype being NULL behavior
* jh/gitweb-caching (2010-11-01) 4 commits
- gitweb: Minimal testing of gitweb caching
- gitweb: File based caching layer (from git.kernel.org)
- gitweb: add output buffering and associated functions
- gitweb: Prepare for splitting gitweb
* jc/abbrev-guard (2010-10-28) 1 commit
(merged to 'next' on 2010-11-24 at f26c943)
+ core.abbrevguard: Ensure short object names stay unique a bit longer
* jc/emfile (2010-10-28) 2 commits
(merged to 'next' on 2010-11-17 at dac1bc6)
@ -307,12 +297,11 @@ Will merge to next.
@@ -307,12 +297,11 @@ Will merge to next.
(this branch is used by sp/emfile.)
* sp/emfile (2010-11-01) 2 commits
- Work around EMFILE when there are too many pack files
- Use git_open_noatime when accessing pack data
(merged to 'next' on 2010-11-24 at f46d2ce)
+ Work around EMFILE when there are too many pack files
+ Use git_open_noatime when accessing pack data
(this branch uses jc/emfile.)
Will merge to 'next', but might want to restructure the API a bit.
* jl/add-p-reverse-message (2010-10-27) 1 commit
(merged to 'next' on 2010-11-17 at db2ce14)
+ Correct help blurb in checkout -p and friends
@ -339,21 +328,6 @@ Wait for a reroll from Jonathan (2010-11-09).
@@ -339,21 +328,6 @@ Wait for a reroll from Jonathan (2010-11-09).
+ Interix: add configure checks
+ add support for the SUA layer (interix; windows)
* mm/phrase-remote-tracking (2010-11-02) 10 commits
(merged to 'next' on 2010-11-15 at 07d67f4)
+ git-branch.txt: mention --set-upstream as a way to change upstream configuration
+ user-manual: remote-tracking can be checked out, with detached HEAD
+ user-manual.txt: explain better the remote(-tracking) branch terms
+ Change incorrect "remote branch" to "remote tracking branch" in C code
+ Change incorrect uses of "remote branch" meaning "remote-tracking"
+ Change "tracking branch" to "remote-tracking branch"
+ everyday.txt: change "tracking branch" to "remote-tracking branch"
+ Change remote tracking to remote-tracking in non-trivial places
+ Replace "remote tracking" with "remote-tracking"
+ Better "Changed but not updated" message in git-status
Will merge to master soonish.
* nd/setup (2010-11-11) 47 commits
- git.txt: correct where --work-tree path is relative to
- Revert "Documentation: always respect core.worktree if set"
@ -412,40 +386,22 @@ I have to queue a handful of fixups still in flight.
@@ -412,40 +386,22 @@ I have to queue a handful of fixups still in flight.
Will merge to master soonish.
* sn/diff-doc (2010-11-04) 3 commits
- docs: clarify git diff modes of operation
- diff,difftool: Don't use the {0,2} notation in usage strings
- CodingGuidelines: Add a section on writing documentation
Will merge to next.
* kb/maint-rebase-autosquash (2010-11-04) 2 commits
(merged to 'next' on 2010-11-15 at 9b8c830)
+ rebase: teach --autosquash to match on sha1 in addition to message
+ rebase: better rearranging of fixup!/squash! lines with --autosquash
Will merge to master soonish.
(merged to 'next' on 2010-11-24 at 77190a5)
+ docs: clarify git diff modes of operation
+ diff,difftool: Don't use the {0,2} notation in usage strings
+ CodingGuidelines: Add a section on writing documentation
* kb/maint-status-cquote (2010-11-08) 1 commit
- status: Quote paths with spaces in short format
Will merge to next.
(merged to 'next' on 2010-11-24 at e15b73d)
+ status: Quote paths with spaces in short format
* mg/maint-tag-rfc1991 (2010-11-10) 5 commits
- tag: recognize rfc1991 signatures
- tag: factor out sig detection for tag display
- tag: factor out sig detection for body edits
- verify-tag: factor out signature detection
- t/t7004-tag: test handling of rfc1991 signatures
Will merge to next.
* ao/send-email-irt (2010-11-12) 2 commits
(merged to 'next' on 2010-11-15 at 257c77a)
+ git-send-email.perl: make initial In-Reply-To apply only to first email
(merged to 'next' on 2010-11-08 at d103166)
+ t9001: send-email interation with --in-reply-to and --chain-reply-to
Will merge to master soonish.
(merged to 'next' on 2010-11-24 at 03864ed)
+ tag: recognize rfc1991 signatures
+ tag: factor out sig detection for tag display
+ tag: factor out sig detection for body edits
+ verify-tag: factor out signature detection
+ t/t7004-tag: test handling of rfc1991 signatures
* cm/diff-check-at-eol (2010-10-10) 1 commit
(merged to 'next' on 2010-11-17 at ad7005a)
@ -456,14 +412,6 @@ Will merge to master soonish.
@@ -456,14 +412,6 @@ Will merge to master soonish.
+ test: git-apply -p2 rename/chmod only
+ Fix git-apply with -p greater than 1
* jk/add-e-doc (2010-11-08) 2 commits
(merged to 'next' on 2010-11-15 at e971401)
+ docs: give more hints about how "add -e" works
(merged to 'next' on 2010-11-05 at 389fee7)
+ docs: give more hints about how "add -e" works
Will merge to master soonish.
* jk/diff-CBM (2010-10-21) 1 commit
(merged to 'next' on 2010-11-05 at 9d1ec14)
+ diff: report bogus input to -C/-M/-B
@ -485,9 +433,6 @@ Will merge to master soonish.
@@ -485,9 +433,6 @@ Will merge to master soonish.
- commit/status -h: show usage even with broken configuration
- checkout-index -h: show usage even in an invalid repository
- branch -h: show usage even in an invalid repository
(this branch uses en/and-cascade-tests.)
Will merge to next.
* kb/blame-author-email (2010-10-15) 1 commit
(merged to 'next' on 2010-11-17 at 6fd6a2f)
@ -555,7 +500,9 @@ Yet to be rerolled.
@@ -555,7 +500,9 @@ Yet to be rerolled.
+ Merge branch 'en/rename-d-f' into en/merge-recursive
(this branch uses en/rename-d-f.)
* il/remote-fd-ext (2010-10-12) 3 commits
* il/remote-fd-ext (2010-11-17) 4 commits
(merged to 'next' on 2010-11-24 at ef80cf1)
+ remote-fd/ext: finishing touches after code review
(merged to 'next' on 2010-11-05 at 7413413)
+ git-remote-ext
+ git-remote-fd
@ -577,82 +524,50 @@ Yet to be rerolled.
@@ -577,82 +524,50 @@ Yet to be rerolled.
+ t7607: use test-lib functions and check MERGE_HEAD
* jh/notes-merge (2010-11-09) 23 commits
- Provide 'git merge --abort' as a synonym to 'git reset --merge'
- cmd_merge(): Parse options before checking MERGE_HEAD
- Provide 'git notes get-ref' to easily retrieve current notes ref
- git notes merge: Add testcases for merging notes trees at different fanouts
- git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
- git notes merge: --commit should fail if underlying notes ref has moved
- git notes merge: List conflicting notes in notes merge commit message
- git notes merge: Manual conflict resolution, part 2/2
- git notes merge: Manual conflict resolution, part 1/2
- Documentation: Preliminary docs on 'git notes merge'
- git notes merge: Add automatic conflict resolvers (ours, theirs, union)
- git notes merge: Handle real, non-conflicting notes merges
- builtin/notes.c: Refactor creation of notes commits.
- git notes merge: Initial implementation handling trivial merges only
- builtin/notes.c: Split notes ref DWIMmery into a separate function
- notes.c: Use two newlines (instead of one) when concatenating notes
- (trivial) t3303: Indent with tabs instead of spaces for consistency
- notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
- notes.h/c: Allow combine_notes functions to remove notes
- notes.c: Reorder functions in preparation for next commit
- notes.h: Make default_notes_ref() available in notes API
- (trivial) notes.h: Minor documentation fixes to copy_notes()
- notes.c: Hexify SHA1 in die() message from init_notes()
Rerolled; will merge to next.
(merged to 'next' on 2010-11-24 at 6218115)
+ Provide 'git merge --abort' as a synonym to 'git reset --merge'
+ cmd_merge(): Parse options before checking MERGE_HEAD
+ Provide 'git notes get-ref' to easily retrieve current notes ref
+ git notes merge: Add testcases for merging notes trees at different fanouts
+ git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
+ git notes merge: --commit should fail if underlying notes ref has moved
+ git notes merge: List conflicting notes in notes merge commit message
+ git notes merge: Manual conflict resolution, part 2/2
+ git notes merge: Manual conflict resolution, part 1/2
+ Documentation: Preliminary docs on 'git notes merge'
+ git notes merge: Add automatic conflict resolvers (ours, theirs, union)
+ git notes merge: Handle real, non-conflicting notes merges
+ builtin/notes.c: Refactor creation of notes commits.
+ git notes merge: Initial implementation handling trivial merges only
+ builtin/notes.c: Split notes ref DWIMmery into a separate function
+ notes.c: Use two newlines (instead of one) when concatenating notes
+ (trivial) t3303: Indent with tabs instead of spaces for consistency
+ notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
+ notes.h/c: Allow combine_notes functions to remove notes
+ notes.c: Reorder functions in preparation for next commit
+ notes.h: Make default_notes_ref() available in notes API
+ (trivial) notes.h: Minor documentation fixes to copy_notes()
+ notes.c: Hexify SHA1 in die() message from init_notes()
* pn/commit-autosquash (2010-11-02) 6 commits
- add tests of commit --squash
- commit: --squash option for use with rebase --autosquash
- add tests of commit --fixup
- commit: --fixup option for use with rebase --autosquash
- pretty.c: teach format_commit_message() to reencode the output
- commit: helper methods to reduce redundant blocks of code
Will merge to next.
(merged to 'next' on 2010-11-24 at acc9c78)
+ add tests of commit --squash
+ commit: --squash option for use with rebase --autosquash
+ add tests of commit --fixup
+ commit: --fixup option for use with rebase --autosquash
+ pretty.c: teach format_commit_message() to reencode the output
+ commit: helper methods to reduce redundant blocks of code
* jj/icase-directory (2010-10-03) 8 commits
- Support case folding in git fast-import when core.ignorecase=true
- Support case folding for git add when core.ignorecase=true
- Add case insensitivity support when using git ls-files
- Add case insensitivity support for directories when using git status
- Case insensitivity support for .gitignore via core.ignorecase
- Add string comparison functions that respect the ignore_case variable.
- Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
- Makefile & configure: add a NO_FNMATCH flag
Will merge to next.
* en/and-cascade-tests (2010-10-31) 25 commits
(merged to 'next' on 2010-11-15 at d51ec77)
+ t4124 (apply --whitespace): use test_might_fail
+ t3404: do not use 'describe' to implement test_cmp_rev
+ t3404 (rebase -i): introduce helper to check position of HEAD
+ t3404 (rebase -i): move comment to description
+ t3404 (rebase -i): unroll test_commit loops
+ t3301 (notes): use test_expect_code for clarity
+ t1400 (update-ref): use test_must_fail
+ t1502 (rev-parse --parseopt): test exit code from "-h"
+ t6022 (renaming merge): chain test commands with &&
+ test-lib: introduce test_line_count to measure files
+ tests: add missing &&, batch 2
+ tests: add missing &&
+ Introduce sane_unset and use it to ensure proper && chaining
+ t7800 (difftool): add missing &&
+ t7601 (merge-pull-config): add missing &&
+ t7001 (mv): add missing &&
+ t6016 (rev-list-graph-simplify-history): add missing &&
+ t5602 (clone-remote-exec): add missing &&
+ t4026 (color): remove unneeded and unchained command
+ t4019 (diff-wserror): add lots of missing &&
+ t4202 (log): Replace '<git-command> || :' with test_might_fail
+ t4002 (diff-basic): use test_might_fail for commands that might fail
+ t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
+ t4017 (diff-retval): replace manual exit code check with test_expect_code
+ test-lib: make test_expect_code a test command
(this branch is used by jn/git-cmd-h-bypass-setup.)
(merged to 'next' on 2010-11-24 at 0da9385)
+ Support case folding in git fast-import when core.ignorecase=true
+ Support case folding for git add when core.ignorecase=true
+ Add case insensitivity support when using git ls-files
+ Add case insensitivity support for directories when using git status
+ Case insensitivity support for .gitignore via core.ignorecase
+ Add string comparison functions that respect the ignore_case variable.
+ Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
+ Makefile & configure: add a NO_FNMATCH flag
* nd/struct-pathspec (2010-09-20) 5 commits
- ce_path_match: drop prefix matching in favor of match_pathspec
Junio C Hamano
14 years ago