To: git@vger.kernel.org
-Subject: What's cooking in git.git (Mar 2010, #04; Tue, 16)
-X-master-at: 60dafdd37d7df358b6ff67b317dbe738b50ea6d6
-X-next-at: 960ece0e784e9392d8be0c804acc7385ddb9f398
+Subject: What's cooking in git.git (Mar 2010, #05; Sat, 20)
+X-master-at: 0d0925c5e25fad8079739be36d88faa21fc1f588
+X-next-at: fdfcd14527c8a7f606aebfcd9dcd99e6cbf7cea5
-What's cooking in git.git (Mar 2010, #04; Tue, 16)
+What's cooking in git.git (Mar 2010, #05; Sat, 20)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
--------------------------------------------------
[Graduated to "master"]
-* sd/format-patch-to (2010-03-07) 4 commits
- (merged to 'next' on 2010-03-08 at 739b8cd)
- + send-email: add --no-cc, --no-to, and --no-bcc
- + format-patch: add --no-cc, --no-to, and --no-add-headers
- + format-patch: use a string_list for headers
- (merged to 'next' on 2010-03-07 at ef7a18d)
- + Add 'git format-patch --to=' option and 'format.to' configuration variable.
-
-* ld/push-porcelain (2010-03-11) 5 commits
- (merged to 'next' on 2010-03-11 at c6dea6a)
- + t5516: Use test_cmp when appropriate
- (merged to 'next' on 2010-03-02 at d15bb1e)
- + git-push: add tests for git push --porcelain
- + git-push: make git push --porcelain print "Done"
- + git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
- + git-push: fix an advice message so it goes to stderr
-
-* tc/http-cleanup (2010-03-02) 7 commits
- (merged to 'next' on 2010-03-07 at e92db25)
- + remote-curl: init walker only when needed
- + remote-curl: use http_fetch_ref() instead of walker wrapper
- + http: init and cleanup separately from http-walker
- + http-walker: cleanup more thoroughly
- + http-push: remove "|| 1" to enable verbose check
- + t554[01]-http-push: refactor, add non-ff tests
- + t5541-http-push: check that ref is unchanged for non-ff test
-
-* tc/transport-verbosity (2010-02-24) 10 commits
- (merged to 'next' on 2010-03-07 at 898d6dd)
- + transport: update flags to be in running order
- + fetch and pull: learn --progress
- + push: learn --progress
- + transport->progress: use flag authoritatively
- + clone: support multiple levels of verbosity
- + push: support multiple levels of verbosity
- + fetch: refactor verbosity option handling into transport.[ch]
- + Documentation/git-push: put --quiet before --verbose
- + Documentation/git-pull: put verbosity options before merge/fetch ones
- + Documentation/git-clone: mention progress in -v
-
-* jh/notes (2010-03-04) 33 commits
- (merged to 'next' on 2010-03-04 at 3bb921f)
- + Documentation: fix a few typos in git-notes.txt
- (merged to 'next' on 2010-02-24 at c88263d)
- + notes: fix malformed tree entry
- + builtin-notes: Minor (mostly parse_options-related) fixes
- (merged to 'next' on 2010-02-21 at 75fc451)
- + builtin-notes: Add "copy" subcommand for copying notes between objects
- + builtin-notes: Misc. refactoring of argc and exit value handling
- + builtin-notes: Add -c/-C options for reusing notes
- + builtin-notes: Refactor handling of -F option to allow combining -m and -F
- + builtin-notes: Deprecate the -m/-F options for "git notes edit"
- + builtin-notes: Add "append" subcommand for appending to note objects
- + builtin-notes: Add "add" subcommand for adding notes to objects
- + builtin-notes: Add --message/--file aliases for -m/-F options
- + builtin-notes: Add "list" subcommand for listing note objects
- + Documentation: Generalize git-notes docs to 'objects' instead of 'commits'
- + builtin-notes: Add "prune" subcommand for removing notes for missing objects
- + Notes API: prune_notes(): Prune notes that belong to non-existing objects
- + t3305: Verify that removing notes triggers automatic fanout consolidation
- + builtin-notes: Add "remove" subcommand for removing existing notes
- + Teach builtin-notes to remove empty notes
- + Teach notes code to properly preserve non-notes in the notes tree
- + t3305: Verify that adding many notes with git-notes triggers increased fanout
- + t3301: Verify successful annotation of non-commits
- + Builtin-ify git-notes
- + Refactor notes concatenation into a flexible interface for combining notes
- + Notes API: Allow multiple concurrent notes trees with new struct notes_tree
- + Notes API: write_notes_tree(): Store the notes tree in the database
- + Notes API: for_each_note(): Traverse the entire notes tree with a callback
- + Notes API: get_note(): Return the note annotating the given object
- + Notes API: remove_note(): Remove note objects from the notes tree structure
- + Notes API: add_note(): Add note objects to the internal notes tree structure
- + Notes API: init_notes(): Initialize the notes tree from the given notes ref
- + Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
- + Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- + Minor cosmetic fixes to notes.c
- (this branch shares commits with sb/notes-parse-opt and tr/notes-display.)
-
---------------------------------------------------
-[New Topics]
-
* jk/maint-add-ignored-dir (2010-02-28) 3 commits
(merged to 'next' on 2010-03-13 at df91e32)
+ tests for "git add ignored-dir/file" without -f
+ dir: fix COLLECT_IGNORED on excluded prefixes
+ t0050: mark non-working test as such
-This replaces jc/maint-add-ignored-dir.
+This replaced jc/maint-add-ignored-dir. Will need to merge to maint
+later.
-* do/rebase-i-arbitrary (2010-03-14) 1 commit
- - rebase--interactive: don't require what's rebased to be a branch
+* bg/apply-fix-blank-at-eof (2010-03-06) 5 commits
+ (merged to 'next' on 2010-03-07 at daec679)
+ + t3417: Add test cases for "rebase --whitespace=fix"
+ + t4124: Add additional tests of --whitespace=fix
+ + apply: Allow blank context lines to match beyond EOF
+ + apply: Remove the quick rejection test
+ + apply: Don't unnecessarily update line lengths in the preimage
-* ja/send-email-ehlo (2010-03-14) 3 commits
- - git-send-email.perl - try to give real name of the calling host to HELO/EHLO
- - git-send-email.perl: add option --smtp-debug
- - git-send-email.perl: improve error message in send_message()
+* fl/askpass (2010-03-04) 2 commits
+ (merged to 'next' on 2010-03-07 at 5ab370a)
+ + git-core: Support retrieving passwords with GIT_ASKPASS
+ + git-svn: Support retrieving passwords with GIT_ASKPASS
-* ak/everyday-git (2009-10-21) 1 commit
- - everyday: fsck and gc are not everyday operations
+* jc/color-attrs (2010-02-27) 1 commit
+ (merged to 'next' on 2010-03-08 at ba02883)
+ + color: allow multiple attributes
-* bc/acl-test (2010-03-15) 5 commits
- - t/t1304: make a second colon optional in the mask ACL check
- - t/t1304: set the ACL effective rights mask
- - t/t1304: use 'test -r' to test readability rather than looking at mode bits
- - t/t1304: set the Default ACL base entries
- - t/t1304: avoid -d option to setfacl
+* ml/color-grep (2010-03-07) 3 commits
+ (merged to 'next' on 2010-03-08 at 24d1eb4)
+ + grep: Colorize selected, context, and function lines
+ + grep: Colorize filename, line number, and separator
+ + Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
-* bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit
- - daemon.c: avoid accessing ss_family member of struct sockaddr_storage
+* bw/union-merge-refactor (2010-03-01) 4 commits
+ (merged to 'next' on 2010-03-10 at b917078)
+ + merge-file: add option to select union merge favor
+ + merge-file: add option to specify the marker size
+ (merged to 'next' on 2010-03-07 at 9d1eff6)
+ + refactor merge flags into xmparam_t
+ + make union merge an xdl merge favor
-* ef/cherry-abbrev (2010-03-15) 1 commit
- - cherry: support --abbrev option
+* cc/reset-keep (2010-03-09) 6 commits
+ (merged to 'next' on 2010-03-08 at 015ef4b)
+ + Documentation: improve description of "git reset --keep"
+ (merged to 'next' on 2010-03-07 at 5237d8e)
+ + reset: disallow using --keep when there are unmerged entries
+ + reset: disallow "reset --keep" outside a work tree
+ + Documentation: reset: describe new "--keep" option
+ + reset: add test cases for "--keep" option
+ + reset: add option "--keep" to "git reset"
-* gh/maint-stash-show-error-message (2010-03-16) 1 commit
- - Improve error messages from 'git stash show'
+--------------------------------------------------
+[New Topics]
-* jc/maint-refs-dangling (2010-03-15) 1 commit
- (merged to 'next' on 2010-03-16 at 376027b)
- + refs: ref entry with NULL sha1 is can be a dangling symref
+* ar/config-from-command-line (2010-03-19) 1 commit
+ - Allow passing of configuration parameters in the command line
-* rs/threaded-grep-context (2010-03-15) 1 commit
- - grep: enable threading for context line printing
+* bc/t5505-fix (2010-03-19) 3 commits
+ - t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
+ - t5505: add missing &&
+ - t5505: remove unnecessary subshell invocations
+
+Looked reasonable. Soon in 'next'.
+
+* bw/template-tool-buildconfig (2010-03-20) 2 commits
+ - Modernize git calling conventions in hook templates
+ - Make templates honour SHELL_PATH and PERL_PATH
+
+Looked reasonable. Soon in 'next'.
+
+* mb/rebase-i-no-ff (2010-03-16) 1 commit
+ - Teach --no-ff option to 'rebase -i'.
+
+Looked reasonable. Soon in 'next'.
+
+* jn/merge-diff3-label (2010-03-17) 13 commits
+ . cherry-pick, revert: add a label for ancestor
+ . revert: clarify label on conflict hunks
+ . compat: add mempcpy()
+ . tests: document cherry-pick behavior in face of conflicts
+ . checkout -m --conflict=diff3: add a label for ancestor
+ . tests: document format of conflicts from checkout -m
+ . merge_trees(): add ancestor label parameter for diff3-style output
+ . merge_file(): add comment explaining behavior wrt conflict style
+ . checkout --conflict=diff3: add a label for ancestor
+ . ll_merge(): add ancestor label parameter for diff3-style output
+ . merge-file --diff3: add a label for ancestor
+ . xdl_merge(): move file1 and file2 labels to xmparam structure
+ . xdl_merge(): add optional ancestor label to diff3-style output
+
+This somewhat conflicts with bw/union-merge-refactor that in 'master'; I
+could resolve the conflicts myself, but I'd rather not. Jonathan, could
+you rebase the series?
--------------------------------------------------
[Stalled]
I retract my objection against the idea of -x; needs polishing before
moving forward.
+* sg/bash-completion (2010-02-23) 4 commits
+ (merged to 'next' on 2010-03-08 at bc59860)
+ + bash: completion for gitk aliases
+ + bash: support user-supplied completion scripts for aliases
+ + bash: support user-supplied completion scripts for user's git commands
+ + bash: improve aliased command recognition
+
+Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
+
* sd/log-decorate (2010-02-17) 3 commits
(merged to 'next' on 2010-03-08 at 58a6fba)
+ log.decorate: usability fixes
--------------------------------------------------
[Cooking]
+* do/rebase-i-arbitrary (2010-03-14) 1 commit
+ - rebase--interactive: don't require what's rebased to be a branch
+
+Looked reasonable. Soon in 'next'.
+
+* ja/send-email-ehlo (2010-03-14) 3 commits
+ - git-send-email.perl - try to give real name of the calling host to HELO/EHLO
+ - git-send-email.perl: add option --smtp-debug
+ - git-send-email.perl: improve error message in send_message()
+
+Looked reasonable. Soon in 'next'.
+
+* ak/everyday-git (2009-10-21) 1 commit
+ - everyday: fsck and gc are not everyday operations
+
+Looked reasonable. Soon in 'next'.
+
+* bc/acl-test (2010-03-15) 5 commits
+ - t/t1304: make a second colon optional in the mask ACL check
+ - t/t1304: set the ACL effective rights mask
+ - t/t1304: use 'test -r' to test readability rather than looking at mode bits
+ - t/t1304: set the Default ACL base entries
+ - t/t1304: avoid -d option to setfacl
+
+Looked reasonable. Soon in 'next'.
+
+* bc/maint-daemon-sans-ss-family (2010-03-15) 1 commit
+ - daemon.c: avoid accessing ss_family member of struct sockaddr_storage
+
+Looked reasonable. Soon in 'next'.
+
+* ef/cherry-abbrev (2010-03-15) 1 commit
+ - cherry: support --abbrev option
+
+Looked reasonable. Soon in 'next'.
+
+* gh/maint-stash-show-error-message (2010-03-16) 1 commit
+ - Improve error messages from 'git stash show'
+
+Looked reasonable. Soon in 'next'.
+
+* jc/maint-refs-dangling (2010-03-15) 1 commit
+ (merged to 'next' on 2010-03-16 at 376027b)
+ + refs: ref entry with NULL sha1 is can be a dangling symref
+
+Looked reasonable. Soon in 'next'.
+
+* rs/threaded-grep-context (2010-03-15) 1 commit
+ - grep: enable threading for context line printing
+
+Looked reasonable. Soon in 'next'.
+
* pb/log-first-parent-p-m (2010-03-09) 5 commits
(merged to 'next' on 2010-03-15 at 0ae494e)
+ show --first-parent/-m: do not default to --cc
(merged to 'next' on 2010-02-17 at 2f8e5ae)
+ git log -p -m: document -m and honor --first-parent
+Ready for 'master'.
+
* jl/submodule-diff-dirtiness (2010-03-13) 5 commits
(merged to 'next' on 2010-03-15 at 9601fd9)
+ git status: ignoring untracked files must apply to submodules too
(merged to 'next' on 2010-03-04 at 58b2645)
+ git diff --submodule: Show detailed dirty status of submodules
-* cc/cherry-pick-ff (2010-03-06) 7 commits
- (merged to 'next' on 2010-03-07 at 5589b26)
+Ready for 'master'.
+
+* cc/cherry-pick-ff (2010-03-06) 6 commits
+ (merged to 'next' on 2010-03-20 at fdfcd14)
+ rebase -i: use new --ff cherry-pick option
- + cherry-pick: add a no-op --no-ff option to future proof scripts
+ (merged to 'next' on 2010-03-07 at 5589b26)
+ Documentation: describe new cherry-pick --ff option
+ cherry-pick: add tests for new --ff option
+ revert: add --ff option to allow fast forward when cherry-picking
+ builtin/merge: make checkout_fast_forward() non static
+ parse-options: add parse_options_concat() to concat options
-I think this is ready for 'master'; comments?
+Ready for 'master'.
* js/async-thread (2010-03-09) 7 commits
- Enable threaded async procedures whenever pthreads is available
- - Dying in an async procedure should only exit the thread, not the process.
- - Reimplement async procedures using pthreads
- - Windows: more pthreads functions
- - Fix signature of fcntl() compatibility dummy
- - Make report() from usage.c public as vreportf() and use it.
- - Modernize t5530-upload-pack-error.
+ (merged to 'next' on 2010-03-20 at 9939243)
+ + Dying in an async procedure should only exit the thread, not the process.
+ + Reimplement async procedures using pthreads
+ + Windows: more pthreads functions
+ + Fix signature of fcntl() compatibility dummy
+ + Make report() from usage.c public as vreportf() and use it.
+ + Modernize t5530-upload-pack-error.
-The last one is probably unsafe for 'next' until somebody goes and vets
-the callees that are invoked via this interface (any possible breakages
-are already inflicted on Windows people, though).
+The tip one will be soon in 'next', but one step at a time.
* nd/setup (2010-03-08) 21 commits
- index-pack: use RUN_SETUP_GENTLY
- builtin: Support RUN_SETUP_GENTLY to set up repository early if found
- builtin: introduce startup_info struct
-* bg/apply-fix-blank-at-eof (2010-03-06) 5 commits
- (merged to 'next' on 2010-03-07 at daec679)
- + t3417: Add test cases for "rebase --whitespace=fix"
- + t4124: Add additional tests of --whitespace=fix
- + apply: Allow blank context lines to match beyond EOF
- + apply: Remove the quick rejection test
- + apply: Don't unnecessarily update line lengths in the preimage
-
-Ready for 'master'.
-
-* sg/bash-completion (2010-02-23) 4 commits
- (merged to 'next' on 2010-03-08 at bc59860)
- + bash: completion for gitk aliases
- + bash: support user-supplied completion scripts for aliases
- + bash: support user-supplied completion scripts for user's git commands
- + bash: improve aliased command recognition
-
-Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
-
-* fl/askpass (2010-03-04) 2 commits
- (merged to 'next' on 2010-03-07 at 5ab370a)
- + git-core: Support retrieving passwords with GIT_ASKPASS
- + git-svn: Support retrieving passwords with GIT_ASKPASS
-
-Perhaps ready for 'master'? I dunno.
-
-* jc/color-attrs (2010-02-27) 1 commit
- (merged to 'next' on 2010-03-08 at ba02883)
- + color: allow multiple attributes
-
-Ready for 'master'.
-
-* ml/color-grep (2010-03-07) 3 commits
- (merged to 'next' on 2010-03-08 at 24d1eb4)
- + grep: Colorize selected, context, and function lines
- + grep: Colorize filename, line number, and separator
- + Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
-
-Ready for 'master'.
-
* sb/notes-parse-opt (2010-02-27) 1 commit
- notes: rework subcommands and parse options
(this branch uses tr/notes-display.)
-* bw/union-merge-refactor (2010-03-01) 4 commits
- (merged to 'next' on 2010-03-10 at b917078)
- + merge-file: add option to select union merge favor
- + merge-file: add option to specify the marker size
- (merged to 'next' on 2010-03-07 at 9d1eff6)
- + refactor merge flags into xmparam_t
- + make union merge an xdl merge favor
-
-Ready for 'master'.
-
* jh/maint-submodule-status-in-void (2010-03-09) 2 commits
(merged to 'next' on 2010-03-15 at 49af9de)
+ git submodule summary: Handle HEAD as argument when on an unborn branch
+ Support showing notes from more than one notes tree
+ test-lib: unset GIT_NOTES_REF to stop it from influencing tests
(this branch is used by sb/notes-parse-opt.)
-
-* cc/reset-keep (2010-03-09) 6 commits
- (merged to 'next' on 2010-03-08 at 015ef4b)
- + Documentation: improve description of "git reset --keep"
- (merged to 'next' on 2010-03-07 at 5237d8e)
- + reset: disallow using --keep when there are unmerged entries
- + reset: disallow "reset --keep" outside a work tree
- + Documentation: reset: describe new "--keep" option
- + reset: add test cases for "--keep" option
- + reset: add option "--keep" to "git reset"
-
-I think this is ready for 'master'. Comments?
-
---------------------------------------------------
-[Ejected from 'next']
-
-* jc/maint-add-ignored-dir (2010-02-28) 3 commits
- (merged to 'next' on 2010-03-08 at a51762e)
- + builtin-add: fix exclude handling
- + tests for "git add ignored-dir/file" without -f
- + t0050: mark non-working test as such
projects / thirdparty / git.git / commitdiff
