From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: What's cooking in git.git (Jan 2010, #07; Fri, 22)
Date: Fri, 22 Jan 2010 19:28:21 -0800 [thread overview]
Message-ID: <7vtyudfqju.fsf@alter.siamese.dyndns.org> (raw)
Here are the topics that have been cooking. Commits prefixed with '-' are
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.
--------------------------------------------------
[Graduated to "master"]
* jc/conflict-marker-size (2010-01-16) 8 commits
(merged to 'next' on 2010-01-18 at f1f6023)
+ rerere: honor conflict-marker-size attribute
+ rerere: prepare for customizable conflict marker length
+ conflict-marker-size: new attribute
+ rerere: use ll_merge() instead of using xdl_merge()
+ merge-tree: use ll_merge() not xdl_merge()
+ xdl_merge(): allow passing down marker_size in xmparam_t
+ xdl_merge(): introduce xmparam_t for merge specific parameters
+ git_attr(): fix function signature
* ag/maint-apply-too-large-p (2010-01-17) 1 commit
(merged to 'next' on 2010-01-18 at 8bd106a)
+ builtin-apply.c: Skip filenames without enough components
* ag/patch-header-verify (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 2cd0ddc)
+ builtin-apply.c: fix the --- and +++ header filename consistency check
* bw/cvsimport (2010-01-19) 3 commits
(merged to 'next' on 2010-01-19 at 63f4c8d)
+ cvsimport: standarize system() calls to external git tools
+ cvsimport: standarize open() calls to external git tools
+ cvsimport: modernize callouts to git subcommands
* jc/checkout-merge-base (2010-01-19) 1 commit
(merged to 'next' on 2010-01-19 at 3665110)
+ Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
* jc/maint-refresh-index-is-optional-for-status (2010-01-19) 1 commit
+ status: don't require the repository to be writable
* nd/status-partial-refresh (2010-01-17) 2 commits
(merged to 'next' on 2010-01-19 at 64f0c0b)
+ rm: only refresh entries that we may touch
(merged to 'next' on 2010-01-16 at f77bc8f)
+ status: only touch path we may need to check
* ap/merge-backend-opts (2008-07-18) 7 commits
(merged to 'next' on 2010-01-18 at cb1f6b7)
+ Document that merge strategies can now take their own options
+ Extend merge-subtree tests to test -Xsubtree=dir.
+ Make "subtree" part more orthogonal to the rest of merge-recursive.
+ pull: Fix parsing of -X<option>
+ Teach git-pull to pass -X<option> to git-merge
+ git merge -X<option>
+ git-merge-file --ours, --theirs
* jc/maint-limit-note-output (2010-01-21) 2 commits
(merged to 'next' on 2010-01-21 at bcb80b9)
+ Fix "log --oneline" not to show notes
(merged to 'next' on 2010-01-20 at 526bfcc)
+ Fix "log" family not to be too agressive about showing notes
* nd/ls-files-sparse-fix (2010-01-20) 1 commit
(merged to 'next' on 2010-01-20 at 0f61dbc)
+ Fix memory corruption when .gitignore does not end by \n
* il/branch-set-upstream (2010-01-18) 2 commits
(merged to 'next' on 2010-01-18 at b9b0993)
+ branch: warn and refuse to set a branch as a tracking branch of itself.
+ Add branch --set-upstream
* il/remote-updates (2010-01-18) 1 commit
(merged to 'next' on 2010-01-18 at 5c3e805)
+ Add git remote set-url
* il/rev-glob (2010-01-22) 3 commits
(merged to 'next' on 2010-01-21 at 453a21c)
+ Documentation: improve description of --glob=pattern and friends
(merged to 'next' on 2010-01-20 at 928ba0a)
+ rev-parse --branches/--tags/--remotes=pattern
+ rev-parse --glob
This is a re-rolled "--namespace=" one.
* jl/submodule-diff (2010-01-18) 4 commits
(merged to 'next' on 2010-01-20 at 95cb513)
+ Performance optimization for detection of modified submodules
(merged to 'next' on 2010-01-17 at 525075b)
+ git status: Show uncommitted submodule changes too when enabled
(merged to 'next' on 2010-01-16 at 0a99e3c)
+ Teach diff that modified submodule directory is dirty
+ Show submodules as modified when they contain a dirty work tree
* js/refer-upstream (2010-01-19) 3 commits
(merged to 'next' on 2010-01-20 at 5a5547a)
+ Teach @{upstream} syntax to strbuf_branchanme()
+ t1506: more test for @{upstream} syntax
+ Introduce <branch>@{upstream} notation
Updated to teach the new syntax to commands like "checkout" and "merge"
that want to behave better when they know what were given was a branch
name, not a random SHA-1.
* jc/branch-d (2009-12-29) 1 commit
(merged to 'next' on 2010-01-10 at 61a14b7)
+ branch -d: base the "already-merged" safety on the branch it merges with
--------------------------------------------------
[Will merge to 'master' after a bit more cooking in 'next']
* jc/fix-tree-walk (2009-09-14) 7 commits
(merged to 'next' on 2010-01-13 at 1c01b87)
+ read-tree --debug-unpack
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh
Resurrected from "Ejected" category. This is fix for a tricky codepath
and testing and improving before it hits 'master' is greatly appreciated.
(I have been using this in my private build for some time).
--------------------------------------------------
[Cooking]
* jh/notes (2010-01-17) 20 commits
. builtin-gc: Teach the new --notes option to garbage-collect notes
. Notes API: gc_notes(): Prune notes that belong to non-existing objects
. t3305: Verify that removing notes triggers automatic fanout consolidation
. builtin-notes: Teach -d option for deleting 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 non-functional fixes to notes.c
Tentatively ejected, as its tests conflict with tests in a higher priority
fix.
* jh/gitweb-cached (2010-01-13) 9 commits
- gitweb: File based caching layer (from git.kernel.org)
- gitweb: Convert output to using indirect file handle
- gitweb: cleanup error message produced by undefined $site_header
- gitweb: add a get function to compliment print_sort_th
- gitweb: add a get function to compliment print_local_time
- gitweb: Makefile improvements
- gitweb: Add option to force version match
- gitweb: change die_error to take "extra" argument for extended die information
- gitweb: Load checking
Replaced with a re-roll. Update to t9500 is probably needed.
* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
- "log --author=me --grep=it" should find intersection, not union
next reply other threads:[~2010-01-23 3:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-23 3:28 Junio C Hamano [this message]
2010-01-23 11:18 ` What's cooking in git.git (Jan 2010, #07; Fri, 22) Jakub Narebski
2010-01-23 16:37 ` Jens Lehmann
2010-01-23 20:03 ` Junio C Hamano
2010-01-24 2:11 ` Junio C Hamano
2010-01-24 8:10 ` Junio C Hamano
2010-01-24 14:09 ` Jens Lehmann
2010-01-25 18:05 ` [RFC/H] "git diff --submodule" showing submodule work tree dirtiness Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vtyudfqju.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).