mirror of
https://github.com/git/git.git
synced 2026-01-18 14:44:28 +00:00
What's cooking (2010/03 #07)
This commit is contained in:
Junio C Hamano
@@ -1,9 +1,9 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Mar 2010, #06; Wed, 24)
|
||||
X-master-at: 5e4f61474202122f376b16181b760f390623bf4e
|
||||
X-next-at: 82eebc138fb5ed99525fe1c2d3062e9256495a05
|
||||
Subject: What's cooking in git.git (Mar 2010, #07; Sun, 28)
|
||||
X-master-at: faf752693abd0a891a9a47a2d398353cc59ee93a
|
||||
X-next-at: 133563ba0a1cd78841512283a1069b49bf69373e
|
||||
|
||||
What's cooking in git.git (Mar 2010, #06; Wed, 24)
|
||||
What's cooking in git.git (Mar 2010, #07; Sun, 28)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
@@ -11,114 +11,42 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
|
||||
marked with '.' do not appear in any of the integration branches, but I am
|
||||
still holding onto them.
|
||||
|
||||
The tip of 'pu' is broken right now; it does not pass t7006.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "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
|
||||
(merged to 'next' on 2010-03-08 at 0697bf4)
|
||||
+ submodule summary: do not fail before the first commit
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
+ show -c: show patch text
|
||||
+ revision: introduce setup_revision_opt
|
||||
+ t4013: add tests for log -p -m --first-parent
|
||||
(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-13 at f9bfd8a)
|
||||
+ git status: Fix false positive "new commits" output for dirty submodules
|
||||
+ Refactor dirty submodule detection in diff-lib.c
|
||||
(merged to 'next' on 2010-03-08 at 33f7a57)
|
||||
+ git status: Show detailed dirty status of submodules in long format
|
||||
(merged to 'next' on 2010-03-04 at 58b2645)
|
||||
+ git diff --submodule: Show detailed dirty status of submodules
|
||||
|
||||
Ready for 'master'.
|
||||
|
||||
* tr/notes-display (2010-03-12) 13 commits
|
||||
(merged to 'next' on 2010-03-15 at 3329361)
|
||||
+ git-notes(1): add a section about the meaning of history
|
||||
+ notes: track whether notes_trees were changed at all
|
||||
+ notes: add shorthand --ref to override GIT_NOTES_REF
|
||||
+ commit --amend: copy notes to the new commit
|
||||
+ rebase: support automatic notes copying
|
||||
+ notes: implement helpers needed for note copying during rewrite
|
||||
+ notes: implement 'git notes copy --stdin'
|
||||
+ rebase -i: invoke post-rewrite hook
|
||||
+ rebase: invoke post-rewrite hook
|
||||
+ commit --amend: invoke post-rewrite hook
|
||||
+ Documentation: document post-rewrite hook
|
||||
+ 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.)
|
||||
As it has been about 6 weeks since the previous feature release, I'd want
|
||||
to start making noises about feature freeze for 1.7.1 in a few days. I
|
||||
expect that the changes still under discussion will be ready by the time
|
||||
the post 1.7.1 cycle begins, and we will hopefully have a cycle for 1.7.2
|
||||
that is shorter than usual to include them.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* bw/git-completion-rpmspec (2010-03-20) 1 commit
|
||||
- Add a git-completion rpm subpackage to the spec
|
||||
* da/maint-python-startup (2010-03-27) 1 commit
|
||||
- Makefile: Remove usage of deprecated Python "has_key" method
|
||||
|
||||
Shipping bash-completion as part of RPM package; since Todd Zullinger who
|
||||
packages git for Fedora joined the thread, I am hoping that I can defer
|
||||
the direction of the final version to the discussion between Todd and Ben.
|
||||
Another thing that this fixes is not described in the log message.
|
||||
|
||||
* ef/maint-empty-commit-log (2010-03-21) 1 commit
|
||||
- rev-list: fix --pretty=oneline with empty message
|
||||
* jc/conflict-marker-size (2010-03-24) 1 commit
|
||||
- diff --check: honor conflict-marker-size attribute
|
||||
|
||||
Looked reasonable. Soon in 'next'.
|
||||
* ld/discovery-limit-to-fs (2010-03-17) 3 commits
|
||||
- Add support for GIT_ONE_FILESYSTEM
|
||||
- truncate cwd string before printing error message
|
||||
- config.c: remove static keyword from git_env_bool()
|
||||
|
||||
* em/checkout-orphan (2010-03-21) 1 commit
|
||||
- git checkout: create unparented branch by --orphan
|
||||
* sb/fmt-merge-msg (2010-03-24) 7 commits
|
||||
- fmt-merge-msg: hide summary option
|
||||
- fmt-merge-msg: remove custom string_list implementation
|
||||
- string-list: add unsorted_string_list_lookup()
|
||||
- fmt-merge-msg: use pretty.c routines
|
||||
- t6200: test fmt-merge-msg more
|
||||
- t6200: modernize with test_tick
|
||||
- fmt-merge-msg: be quiet if nothing to merge
|
||||
|
||||
Looked reasonable, except that we might want to come up with a way to
|
||||
allow people with core.logallrefupdates set to false to still override it
|
||||
with "-l" when switching to this new branch. Or we may not care. I dunno.
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* mg/mailmap-update (2010-03-19) 1 commit
|
||||
- .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* mg/maint-send-email-lazy-editor (2010-03-22) 1 commit
|
||||
- [reword?] send-email: lazily assign editor variable
|
||||
|
||||
* mg/use-default-abbrev-length-in-rev-list (2010-03-22) 1 commit
|
||||
- rev-list: use default abbrev length when abbrev-commit is in effect
|
||||
|
||||
* np/malloc-threading (2010-03-24) 1 commit
|
||||
- Make xmalloc and xrealloc thread-safe
|
||||
|
||||
* rb/maint-python-path (2010-03-21) 1 commit
|
||||
- Correct references to /usr/bin/python which does not exist on FreeBSD
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* rr/imap-send-unconfuse-from-line (2010-03-22) 1 commit
|
||||
- imap-send: Remove limitation on message body
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* sp/maint-http-backend-die-triggers-die-recursively (2010-03-22) 1 commit
|
||||
- http-backend: Don't infinite loop during die()
|
||||
|
||||
Soon in 'next'.
|
||||
* pc/remove-warn (2010-03-26) 4 commits
|
||||
. Remove a redundant errno test in a usage of remove_path
|
||||
. Introduce remove_or_warn function
|
||||
. Implement the rmdir_or_warn function
|
||||
. Generalise the unlink_or_warn function
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
@@ -156,7 +84,64 @@ at least, or possibly when any "--pretty" is explicitly given.
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* ar/config-from-command-line (2010-03-19) 1 commit
|
||||
* np/malloc-threading (2010-03-24) 1 commit
|
||||
- Make xmalloc and xrealloc thread-safe
|
||||
|
||||
Still has locking issues?
|
||||
|
||||
* bw/git-completion-rpmspec (2010-03-20) 1 commit
|
||||
- Add a git-completion rpm subpackage to the spec
|
||||
|
||||
Shipping bash-completion as part of RPM package; since Todd Zullinger who
|
||||
packages git for Fedora joined the thread, I am hoping that I can defer
|
||||
the direction of the final version to the discussion between Todd and Ben.
|
||||
|
||||
* ef/maint-empty-commit-log (2010-03-21) 1 commit
|
||||
- rev-list: fix --pretty=oneline with empty message
|
||||
|
||||
Looked reasonable. Soon in 'next'.
|
||||
|
||||
* em/checkout-orphan (2010-03-21) 1 commit
|
||||
- git checkout: create unparented branch by --orphan
|
||||
|
||||
Looked reasonable, except that we might want to come up with a way to
|
||||
allow people with core.logallrefupdates set to false to still override it
|
||||
with "-l" when switching to this new branch. Or we may not care. I dunno.
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* mg/mailmap-update (2010-03-19) 1 commit
|
||||
- .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* mg/maint-send-email-lazy-editor (2010-03-22) 1 commit
|
||||
- send-email: lazily assign editor variable
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* mg/use-default-abbrev-length-in-rev-list (2010-03-22) 1 commit
|
||||
- rev-list: use default abbrev length when abbrev-commit is in effect
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* rb/maint-python-path (2010-03-21) 1 commit
|
||||
- Correct references to /usr/bin/python which does not exist on FreeBSD
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* rr/imap-send-unconfuse-from-line (2010-03-22) 1 commit
|
||||
- imap-send: Remove limitation on message body
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* sp/maint-http-backend-die-triggers-die-recursively (2010-03-22) 1 commit
|
||||
- http-backend: Don't infinite loop during die()
|
||||
|
||||
Soon in 'next'.
|
||||
|
||||
* ar/config-from-command-line (2010-03-26) 2 commits
|
||||
- Use strbufs instead of open-coded string manipulation
|
||||
- Allow passing of configuration parameters in the command line
|
||||
|
||||
* bc/t5505-fix (2010-03-19) 3 commits
|
||||
@@ -231,6 +216,12 @@ Looked reasonable. Soon in 'next'.
|
||||
|
||||
Looked reasonable. Soon in 'next'.
|
||||
|
||||
* sb/notes-parse-opt (2010-02-27) 1 commit
|
||||
(merged to 'next' on 2010-03-24 at 82eebc1)
|
||||
+ notes: rework subcommands and parse options
|
||||
|
||||
Ready for 'master'.
|
||||
|
||||
* gh/maint-stash-show-error-message (2010-03-16) 1 commit
|
||||
- Improve error messages from 'git stash show'
|
||||
|
||||
@@ -266,7 +257,10 @@ Ready for 'master'.
|
||||
|
||||
The tip one will be soon in 'next', but one step at a time.
|
||||
|
||||
* nd/setup (2010-03-21) 40 commits
|
||||
* nd/setup (2010-03-25) 43 commits
|
||||
- builtins: do not commit pager choice early
|
||||
- builtins: reset startup_info->have_run_setup_gitdir when unsetting up repository
|
||||
- builtins: setup repository before print unknown command error
|
||||
- Guard unallowed access to repository when it's not set up
|
||||
- alias: keep repository found while collecting aliases as long as possible
|
||||
- Allow to undo setup_git_directory_gently() gracefully (and fix alias code)
|
||||
@@ -307,9 +301,3 @@ The tip one will be soon in 'next', but one step at a time.
|
||||
- config: use RUN_SETUP_GENTLY
|
||||
- builtin: Support RUN_SETUP_GENTLY to set up repository early if found
|
||||
- builtin: introduce startup_info struct
|
||||
|
||||
This seems to break t7006 when merged to 'pu'.
|
||||
|
||||
* sb/notes-parse-opt (2010-02-27) 1 commit
|
||||
(merged to 'next' on 2010-03-24 at 82eebc1)
|
||||
+ notes: rework subcommands and parse options
|
||||
|
||||
Reference in New Issue
Block a user