mirror of
https://github.com/git/git.git
synced 2026-01-19 15:09:01 +00:00
What's cooking (2009/11 #05)
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Nov 2009, #04; Tue, 17)
|
||||
X-master-at: e36e6c00cd60130f8792319a5aa0f56d2da68e14
|
||||
X-next-at: 11067eb355ca45876c3b9ea258b494823a3a78d1
|
||||
Subject: What's cooking in git.git (Nov 2009, #05; Sun, 22)
|
||||
X-master-at: 12fb25dce80f6804da73e0b9451caeeddb1b16d9
|
||||
X-next-at: 7074fe79a7635c32006bb5f62bfbfb3c84e69f43
|
||||
|
||||
What's cooking in git.git (Nov 2009, #04; Tue, 17)
|
||||
What's cooking in git.git (Nov 2009, #05; Sun, 22)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
@@ -32,7 +32,7 @@ backward compatible. Currently planned changes are:
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
|
||||
|
||||
* git-send-email won't make deep threads by default
|
||||
* "git send-email" won't make deep threads by default
|
||||
|
||||
Many people said that by default when sending more than 2 patches the
|
||||
threading git-send-email makes by default is hard to read, and they
|
||||
@@ -46,106 +46,39 @@ backward compatible. Currently planned changes are:
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
|
||||
|
||||
* "git-diff -w --exit-code" will exit success if only differences it
|
||||
* "git diff -w --exit-code" will exit success if only differences it
|
||||
found are whitespace changes that are stripped away from the output.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
|
||||
|
||||
I wasn't fully functioning for the past few days, so this round we have
|
||||
only added new topics and new patches to existing ones, without changing
|
||||
the status of individual topics very much.
|
||||
* "git diff -w/-b" won't even produce "diff --git" header when all changes
|
||||
are about whitespaces.
|
||||
|
||||
http://thread.gmane.org/gmane.comp.version-control.git/133256
|
||||
|
||||
Tonight's tip of 'master' is at v1.6.6-rc0. I am aware of a handful of
|
||||
patches sent today but they didn't arraive before I started today's
|
||||
integration cycle and are left out from today's tree.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
|
||||
(merged to 'next' on 2009-11-06 at d70f646)
|
||||
+ pre-commit.sample: Diff against the empty tree when HEAD is invalid
|
||||
* ls/maint-mailinfo-no-inbody (2009-11-20) 1 commit.
|
||||
(merged to 'next' on 2009-11-21 at dba8141)
|
||||
+ git am/mailinfo: Don't look at in-body headers when rebasing
|
||||
|
||||
* js/maint-diff-color-words (2009-10-30) 3 commits.
|
||||
(merged to 'next' on 2009-11-10 at 5619714)
|
||||
+ diff --color-words: bit of clean-up
|
||||
+ diff --color-words -U0: fix the location of hunk headers
|
||||
+ t4034-diff-words: add a test for word diff without context
|
||||
|
||||
Fixes a corner case of running --color-words with -U0.
|
||||
|
||||
* sc/difftool-p4merge (2009-10-28) 1 commit
|
||||
(merged to 'next' on 2009-10-31 at 194b5c5)
|
||||
+ mergetool--lib: add p4merge as a pre-configured mergetool option
|
||||
|
||||
I do not do p4 nor use difftool, so it's much easier for me to merge this
|
||||
to 'master' and wait for anybody to scream if there is breakage.
|
||||
|
||||
* jk/maint-add-p-empty (2009-10-27) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 2bd302f)
|
||||
+ add-interactive: handle deletion of empty files
|
||||
|
||||
* lt/revision-bisect (2009-10-27) 1 commit.
|
||||
(merged to 'next' on 2009-10-30 at 81ee52b)
|
||||
+ Add '--bisect' revision machinery argument
|
||||
|
||||
* rs/pretty-wrap (2009-11-08) 2 commits
|
||||
(merged to 'next' on 2009-11-08 at 8973fd8)
|
||||
+ log --format: don't ignore %w() at the start of format string
|
||||
(merged to 'next' on 2009-10-30 at 403bbfe)
|
||||
+ Implement wrap format %w() as if it is a mode switch
|
||||
(this branch uses js/log-rewrap.)
|
||||
|
||||
* js/log-rewrap (2009-10-18) 3 commits
|
||||
(merged to 'next' on 2009-10-30 at 403bbfe)
|
||||
+ Teach --wrap to only indent without wrapping
|
||||
+ Add strbuf_add_wrapped_text() to utf8.[ch]
|
||||
+ print_wrapped_text(): allow hard newlines
|
||||
(this branch is used by rs/pretty-wrap.)
|
||||
|
||||
* fc/doc-fast-forward (2009-10-24) 1 commit.
|
||||
(merged to 'next' on 2009-11-01 at faaad90)
|
||||
+ Use 'fast-forward' all over the place
|
||||
|
||||
* tz/maint-rpm (2009-11-11) 1 commit.
|
||||
+ Makefile: Ensure rpm packages can be read by older rpm versions
|
||||
|
||||
* np/maint-sideband-favor-status (2009-11-11) 1 commit.
|
||||
(merged to 'next' on 2009-11-15 at 3ecd874)
|
||||
+ give priority to progress messages
|
||||
|
||||
* sb/tutorial-test (2009-11-06) 4 commits
|
||||
(merged to 'next' on 2009-11-15 at 5c82651)
|
||||
+ t1200: prepare for merging with Fast-forward bikeshedding
|
||||
+ t1200: further modernize test script style
|
||||
+ t1200: Make documentation and test agree
|
||||
+ t1200: cleanup and modernize test style
|
||||
|
||||
* ef/msys-imap (2009-10-22) 9 commits.
|
||||
(merged to 'next' on 2009-10-31 at 8630603)
|
||||
+ Windows: use BLK_SHA1 again
|
||||
+ MSVC: Enable OpenSSL, and translate -lcrypto
|
||||
+ mingw: enable OpenSSL
|
||||
+ mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
|
||||
+ imap-send: build imap-send on Windows
|
||||
+ imap-send: fix compilation-error on Windows
|
||||
+ imap-send: use run-command API for tunneling
|
||||
+ imap-send: use separate read and write fds
|
||||
+ imap-send: remove useless uid code
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
* rj/maint-t9700 (2009-11-19) 1 commit.
|
||||
(merged to 'next' on 2009-11-21 at 29e149b)
|
||||
+ t9700-perl-git.sh: Fix a test failure on Cygwin
|
||||
|
||||
* jn/faster-completion-startup (2009-11-17) 1 commit.
|
||||
- Speed up bash completion loading
|
||||
+ Speed up bash completion loading
|
||||
|
||||
* th/maint-remote-update-help-string (2009-11-15) 1 commit.
|
||||
- Update 'git remote update' usage string to match man page.
|
||||
|
||||
* tr/maint-merge-ours-clarification (2009-11-15) 3 commits.
|
||||
- rebase: refuse to rebase with -s ours
|
||||
(merged to 'next' on 2009-11-17 at 3291125)
|
||||
+ rebase docs: clarify --merge and --strategy
|
||||
+ Documentation: clarify 'ours' merge strategy
|
||||
+ Update 'git remote update' usage string to match man page.
|
||||
|
||||
* tc/format-attribute (2009-11-14) 1 commit
|
||||
- Check the format of more printf-type functions
|
||||
+ Check the format of more printf-type functions
|
||||
|
||||
* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.
|
||||
(merged to 'next' on 2009-11-16 at 5b5a93f)
|
||||
@@ -165,102 +98,17 @@ to 'master' and wait for anybody to scream if there is breakage.
|
||||
+ Make sure $PERL_PATH is defined when the test suite is run.
|
||||
|
||||
* th/remote-usage (2009-11-16) 1 commit.
|
||||
- git remote: Separate usage strings for subcommands
|
||||
+ git remote: Separate usage strings for subcommands
|
||||
|
||||
* mo/maint-crlf-doc (2009-11-14) 1 commit.
|
||||
(merged to 'next' on 2009-11-17 at abd9133)
|
||||
+ core.autocrlf documentation: mention the crlf attribute
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* rj/cygwin-msvc (2009-11-09) 3 commits.
|
||||
- Add explicit Cygwin check to guard WIN32 header inclusion
|
||||
- MSVC: Add support for building with NO_MMAP
|
||||
- Makefile: keep MSVC and Cygwin configuration separate
|
||||
* rj/cygwin-msvc (2009-11-09) 2 commits.
|
||||
+ MSVC: Add support for building with NO_MMAP
|
||||
+ Makefile: keep MSVC and Cygwin configuration separate
|
||||
(this branch uses rj/maint-simplify-cygwin-makefile.)
|
||||
|
||||
I think J6t was not happy with the tip one.
|
||||
|
||||
* jc/fix-tree-walk (2009-10-22) 11 commits.
|
||||
(merged to 'next' on 2009-10-22 at 10c0c8f)
|
||||
+ Revert failed attempt since 353c5ee
|
||||
+ read-tree --debug-unpack
|
||||
(merged to 'next' on 2009-10-11 at 0b058e2)
|
||||
+ 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
|
||||
+ unpack_callback(): use unpack_failed() consistently
|
||||
+ unpack-trees: typofix
|
||||
+ diff-lib.c: fix misleading comments on oneway_diff()
|
||||
|
||||
This has some stupid bugs and temporarily reverted from 'next' until I can
|
||||
fix it, but the "temporarily" turned out to be very loooong. Sigh...
|
||||
|
||||
* jh/notes (2009-10-09) 22 commits.
|
||||
- fast-import: Proper notes tree manipulation using the notes API
|
||||
- Refactor notes concatenation into a flexible interface for combining notes
|
||||
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
|
||||
- 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: add_note(): Add note objects to the internal notes tree structure
|
||||
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
|
||||
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
|
||||
(merged to 'next' on 2009-11-01 at 948327a)
|
||||
+ Add selftests verifying concatenation of multiple notes for the same commit
|
||||
+ Refactor notes code to concatenate multiple notes annotating the same object
|
||||
+ Add selftests verifying that we can parse notes trees with various fanouts
|
||||
+ Teach the notes lookup code to parse notes trees with various fanout schemes
|
||||
+ Teach notes code to free its internal data structures on request
|
||||
+ Add '%N'-format for pretty-printing commit notes
|
||||
+ Add flags to get_commit_notes() to control the format of the note string
|
||||
+ t3302-notes-index-expensive: Speed up create_repo()
|
||||
+ fast-import: Add support for importing commit notes
|
||||
+ Teach "-m <msg>" and "-F <file>" to "git notes edit"
|
||||
+ Add an expensive test for git-notes
|
||||
+ Speed up git notes lookup
|
||||
+ Add a script to edit/inspect notes
|
||||
+ Introduce commit notes
|
||||
|
||||
I somehow thought that the later API part was waiting for updates but
|
||||
nothing seems to be happening.
|
||||
|
||||
* jn/gitweb-blame (2009-09-01) 5 commits.
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-10-11 at 73c4a83)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame. Any progress or RFH?
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits.
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
|
||||
It seemed to be moving again soon, but nothing has happened yet...
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 1b99c56)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* jp/fetch-cull-many-refs (2009-11-13) 3 commits
|
||||
(merged to 'next' on 2009-11-15 at db0f967)
|
||||
+ remote: fix use-after-free error detected by glibc in ref_remove_duplicates
|
||||
@@ -268,8 +116,6 @@ says "no"?)
|
||||
+ fetch: Speed up fetch of large numbers of refs
|
||||
+ remote: Make ref_remove_duplicates faster for large numbers of refs
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* jn/help-everywhere (2009-11-09) 21 commits
|
||||
(merged to 'next' on 2009-11-17 at 3a2dffe)
|
||||
+ diff --no-index: make the usage string less scary
|
||||
@@ -295,10 +141,6 @@ Soon in 'master'.
|
||||
+ Show usage string for 'git grep -h'
|
||||
(this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
|
||||
|
||||
There were unrelated but still worthy fixes, so I reordered some of them;
|
||||
also the "usage()" change is different from the one that was posted (see
|
||||
my comment in $gmane/132592).
|
||||
|
||||
* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
|
||||
(merged to 'next' on 2009-11-17 at cd35125)
|
||||
+ http-fetch: add missing initialization of argv0_path
|
||||
@@ -309,33 +151,14 @@ my comment in $gmane/132592).
|
||||
+ Retire fetch--tool helper to contrib/examples
|
||||
(this branch is used by jn/help-everywhere.)
|
||||
|
||||
These two were originally part of the "help-everywhere" topic but
|
||||
they can stand on their own.
|
||||
|
||||
* jc/log-stdin (2009-11-03) 1 commit
|
||||
- Teach --stdin option to "log" family
|
||||
|
||||
This is not signed-off (see $gmane/131971 for list of things you can do to
|
||||
help advancing this topic).
|
||||
|
||||
* jn/gitweb-log-history (2009-11-13) 3 commits
|
||||
(merged to 'next' on 2009-11-17 at d225f7d)
|
||||
+ gitweb: Make 'history' view (re)use git_log_generic()
|
||||
+ gitweb: Refactor common parts of 'log' and 'shortlog' views
|
||||
+ gitweb: Refactor 'log' action generation, adding git_log_body()
|
||||
|
||||
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
|
||||
- git-pull.sh --rebase: overhaul error handling when no candidates are found
|
||||
|
||||
I heard this needs at least retitling among other changes?
|
||||
|
||||
* rg/doc-workflow (2009-11-17) 4 commits.
|
||||
- [Further RFC updates from Raman]
|
||||
- [An RFC fix-up to further reword release section]
|
||||
- Corrections to release management section in gitworkflows.txt
|
||||
- Add branch management for releases to gitworkflows
|
||||
|
||||
The top three patches are meant to be squashed into the first one.
|
||||
* rg/doc-workflow (2009-11-17) 1 commit.
|
||||
+ Add branch management for releases to gitworkflows
|
||||
|
||||
* sb/ls-tree-parseopt (2009-11-13) 2 commits.
|
||||
(merged to 'next' on 2009-11-17 at c383204)
|
||||
@@ -361,15 +184,6 @@ add", not in "git add" proper, at least initially.
|
||||
+ filter-branch: nearest-ancestor rewriting outside subdir filter
|
||||
+ filter-branch: stop special-casing $filter_subdir argument
|
||||
|
||||
Updated again. Looked sane, except that the option might not be
|
||||
necessary, but that can be fixed while in 'next'.
|
||||
|
||||
* em/commit-claim (2009-11-04) 1 commit
|
||||
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
|
||||
|
||||
I just picked better bits from both versions, but this needs to be
|
||||
rethought.
|
||||
|
||||
* bg/format-patch-doc-update (2009-11-07) 4 commits.
|
||||
(merged to 'next' on 2009-11-17 at 68b9056)
|
||||
+ format-patch: Add "--no-stat" as a synonym for "-p"
|
||||
@@ -377,31 +191,10 @@ rethought.
|
||||
+ format-patch documentation: Remove diff options that are not useful
|
||||
+ format-patch: Always generate a patch
|
||||
|
||||
Looked sensible, even though this may want to wait for 1.7.0. We'll see.
|
||||
|
||||
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
|
||||
- Makefile: merge two Cygwin configuration sections into one
|
||||
+ Makefile: merge two Cygwin configuration sections into one
|
||||
(this branch is used by rj/cygwin-msvc.)
|
||||
|
||||
This is one of the most obviously correct bit from "Compiling on Cygwin
|
||||
using MSVC fails" topic.
|
||||
|
||||
* bg/fetch-multi (2009-11-10) 9 commits.
|
||||
- Re-implement 'git remote update' using 'git fetch'
|
||||
- builtin-fetch: add --dry-run option
|
||||
- builtin-fetch: add --prune option
|
||||
- teach warn_dangling_symref to take a FILE argument
|
||||
- remote: refactor some logic into get_stale_heads()
|
||||
- Add missing test for 'git remote update --prune'
|
||||
- Add the configuration option skipFetchAll
|
||||
- Teach the --multiple option to 'git fetch'
|
||||
- Teach the --all option to 'git fetch'
|
||||
|
||||
* cc/bisect-doc (2009-11-08) 1 commit
|
||||
- Documentation: add "Fighting regressions with git bisect" article
|
||||
|
||||
Any comments? Should it go to Documentation/technical instead?
|
||||
|
||||
* jn/editor-pager (2009-10-30) 9 commits
|
||||
(merged to 'next' on 2009-11-15 at 7f3e3ae)
|
||||
+ Provide a build time default-pager setting
|
||||
@@ -419,49 +212,6 @@ Any comments? Should it go to Documentation/technical instead?
|
||||
+ configure: add settings for gitconfig, editor and pager
|
||||
+ configure: add macro to set arbitrary make variables
|
||||
|
||||
This will follow jn/editor-pager series.
|
||||
|
||||
* sr/vcs-helper (2009-11-18) 12 commits
|
||||
- Add Python support library for remote helpers
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Fix various memory leaks in transport-helper.c
|
||||
- Allow helper to map private ref names into normal names
|
||||
- Add support for "import" helper command
|
||||
- Allow specifying the remote helper in the url
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Fix memory leak in helper method for disconnect
|
||||
|
||||
Replaced again.
|
||||
|
||||
* mr/gitweb-snapshot (2009-11-07) 4 commits.
|
||||
- gitweb: Smarter snapshot names
|
||||
- gitweb: Document current snapshot rules via new tests
|
||||
- t/gitweb-lib.sh: Split gitweb output into headers and body
|
||||
(merged to 'next' on 2009-10-11 at 22ba047)
|
||||
+ gitweb: check given hash before trying to create snapshot
|
||||
|
||||
Replaced commits near the tip with recent updates.
|
||||
|
||||
* jc/pretty-lf (2009-10-04) 1 commit.
|
||||
- Pretty-format: %[+-]x to tweak inter-item newlines
|
||||
|
||||
* ks/precompute-completion (2009-11-15) 4 commits.
|
||||
(merged to 'next' on 2009-11-15 at 23cdb96)
|
||||
+ Revert ks/precompute-completion series
|
||||
(merged to 'next' on 2009-10-28 at cd5177f)
|
||||
+ completion: ignore custom merge strategies when pre-generating
|
||||
(merged to 'next' on 2009-10-22 at f46a28a)
|
||||
+ bug: precomputed completion includes scripts sources
|
||||
(merged to 'next' on 2009-10-14 at adf722a)
|
||||
+ Speedup bash completion loading
|
||||
|
||||
Reverted out of 'next', to be replaced with jn/faster-completion-startup
|
||||
topic.
|
||||
|
||||
* sp/smart-http (2009-11-14) 37 commits
|
||||
(merged to 'next' on 2009-11-17 at 11067eb)
|
||||
+ http-backend: Let gcc check the format of more printf-type functions.
|
||||
@@ -504,6 +254,205 @@ topic.
|
||||
+ pkt-line: Add strbuf based functions
|
||||
+ http-push: fix check condition on http.c::finish_http_pack_request()
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* bg/apply-doc (2009-11-22) 4 commits
|
||||
(merged to 'next' on 2009-11-22 at b42fece)
|
||||
+ apply: Use the term "working tree" consistently
|
||||
+ apply: Format all options using back-quotes
|
||||
+ apply: apply works outside a repository
|
||||
+ Clarify and correct -z
|
||||
|
||||
* cc/replace (2009-11-19) 3 commits
|
||||
(merged to 'next' on 2009-11-21 at 2aaf84b)
|
||||
+ Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
|
||||
+ Documentation: fix typos and spelling in replace documentation
|
||||
+ replace: use a GIT_NO_REPLACE_OBJECTS env variable
|
||||
|
||||
* fc/send-email-envelope (2009-11-22) 1 commit.
|
||||
- t9001: test --envelope-sender option of send-email
|
||||
|
||||
The new feature itself looked promising; this is just an unrelated test
|
||||
patch.
|
||||
|
||||
* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit
|
||||
(merged to 'next' on 2009-11-21 at 3375bf4)
|
||||
+ No diff -b/-w output for all-whitespace changes
|
||||
|
||||
* jc/checkout-merge-base (2009-11-20) 2 commits
|
||||
- "rebase --onto A...B" replays history on the merge base between A and B
|
||||
- "checkout A...B" switches to the merge base between A and B
|
||||
|
||||
* mm/maint-hint-failed-merge (2009-11-22) 2 commits.
|
||||
(merged to 'next' on 2009-11-22 at c0f64c2)
|
||||
+ user-manual: Document that "git merge" doesn't like uncommited changes.
|
||||
+ merge-recursive: point the user to commit when file would be overwritten.
|
||||
|
||||
* rj/maint-cygwin-count-objects (2009-11-19) 2 commits.
|
||||
(merged to 'next' on 2009-11-22 at 4ba5880)
|
||||
+ ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
|
||||
+ git-count-objects: Fix a disk-space under-estimate on Cygwin
|
||||
|
||||
* rs/color-escape-has-zero-width (2009-11-23) 1 commit
|
||||
- Teach %w() that color escape codes have zero width
|
||||
|
||||
* tr/reset-checkout-patch (2009-11-19) 1 commit.
|
||||
(merged to 'next' on 2009-11-22 at b224950)
|
||||
+ {checkout,reset} -p: make patch direction configurable
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* jc/fix-tree-walk (2009-10-22) 8 commits
|
||||
(merged to 'next' on 2009-10-22 at 10c0c8f)
|
||||
+ Revert failed attempt since 353c5ee
|
||||
+ read-tree --debug-unpack
|
||||
(merged to 'next' on 2009-10-11 at 0b058e2)
|
||||
+ 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
|
||||
|
||||
This has some stupid bugs and reverted from 'next' until I can fix it, but
|
||||
the "temporarily" turned out to be very loooong. Sigh...
|
||||
|
||||
* sr/gfi-options (2009-09-06) 6 commits.
|
||||
- fast-import: test the new option command
|
||||
- fast-import: add option command
|
||||
- fast-import: test the new feature command
|
||||
- fast-import: add feature command
|
||||
- fast-import: put marks reading in it's own function
|
||||
- fast-import: put option parsing code in separate functions
|
||||
|
||||
It seemed to be moving again soon, but nothing has happened yet...
|
||||
|
||||
* je/send-email-no-subject (2009-08-05) 1 commit.
|
||||
(merged to 'next' on 2009-10-11 at 1b99c56)
|
||||
+ send-email: confirm on empty mail subjects
|
||||
|
||||
The existing tests cover the positive case (i.e. as long as the user says
|
||||
"yes" to the "do you really want to send this message that lacks subject",
|
||||
the message is sent) of this feature, but the feature itself needs its own
|
||||
test to verify the negative case (i.e. does it correctly stop if the user
|
||||
says "no"?)
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* jh/notes (2009-11-20) 10 commits
|
||||
- Add more testcases to test fast-import of notes
|
||||
- Rename t9301 to t9350, to make room for more fast-import tests
|
||||
- fast-import: Proper notes tree manipulation using the notes API
|
||||
- Refactor notes concatenation into a flexible interface for combining notes
|
||||
- Notes API: Allow multiple concurrent notes trees with new struct notes_tree
|
||||
- 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: add_note(): Add note objects to the internal notes tree structure
|
||||
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
|
||||
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
|
||||
|
||||
Early part has been lived in 'next' for a while and has graduated. This
|
||||
is a reroll of the remainder. Is everybody happy with merging this to
|
||||
'next'? I saw some checkpatch style violations, but didn't find anything
|
||||
objectionable in the logic.
|
||||
|
||||
* jn/gitweb-blame (2009-11-19) 6 commits.
|
||||
- gitweb.js: fix null object exception in initials calculation
|
||||
- gitweb: Minify gitweb.js if JSMIN is defined
|
||||
- gitweb: Create links leading to 'blame_incremental' using JavaScript
|
||||
(merged to 'next' on 2009-10-11 at 73c4a83)
|
||||
+ gitweb: Colorize 'blame_incremental' view during processing
|
||||
+ gitweb: Incremental blame (using JavaScript)
|
||||
+ gitweb: Add optional "time to generate page" info in footer
|
||||
|
||||
Ajax-y blame, with a few recent fixes.
|
||||
|
||||
* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
|
||||
(merged to 'next' on 2009-11-21 at fadaf7b)
|
||||
+ rebase: refuse to rebase with -s ours
|
||||
|
||||
* jc/log-stdin (2009-11-20) 4 commits
|
||||
(merged to 'next' on 2009-11-21 at c3e2e52)
|
||||
+ Make --stdin option to "log" family read also pathspecs
|
||||
+ setup_revisions(): do not call get_pathspec() too early
|
||||
+ Teach --stdin option to "log" family
|
||||
+ read_revision_from_stdin(): use strbuf
|
||||
|
||||
Still no tests yet but with docs from Peff.
|
||||
|
||||
* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
|
||||
- git-pull.sh --rebase: overhaul error handling when no candidates are found
|
||||
|
||||
I heard this needs at least retitling among other changes?
|
||||
|
||||
* em/commit-claim (2009-11-04) 1 commit
|
||||
- commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
|
||||
|
||||
I just picked better bits from both versions, but this needs to be
|
||||
rethought.
|
||||
|
||||
* bg/fetch-multi (2009-11-10) 9 commits.
|
||||
(merged to 'next' on 2009-11-21 at 282f464)
|
||||
+ Re-implement 'git remote update' using 'git fetch'
|
||||
+ builtin-fetch: add --dry-run option
|
||||
+ builtin-fetch: add --prune option
|
||||
+ teach warn_dangling_symref to take a FILE argument
|
||||
+ remote: refactor some logic into get_stale_heads()
|
||||
+ Add missing test for 'git remote update --prune'
|
||||
+ Add the configuration option skipFetchAll
|
||||
+ Teach the --multiple option to 'git fetch'
|
||||
+ Teach the --all option to 'git fetch'
|
||||
|
||||
* cc/bisect-doc (2009-11-08) 1 commit
|
||||
- Documentation: add "Fighting regressions with git bisect" article
|
||||
|
||||
Any comments? Should it go to Documentation/technical instead?
|
||||
|
||||
* sr/vcs-helper (2009-11-18) 12 commits
|
||||
- Add Python support library for remote helpers
|
||||
- Basic build infrastructure for Python scripts
|
||||
- Allow helpers to report in "list" command that the ref is unchanged
|
||||
- Fix various memory leaks in transport-helper.c
|
||||
- Allow helper to map private ref names into normal names
|
||||
- Add support for "import" helper command
|
||||
- Allow specifying the remote helper in the url
|
||||
- Add a config option for remotes to specify a foreign vcs
|
||||
- Allow fetch to modify refs
|
||||
- Use a function to determine whether a remote is valid
|
||||
- Allow programs to not depend on remotes having urls
|
||||
- Fix memory leak in helper method for disconnect
|
||||
|
||||
Replaced again. Is everybody happy with merging this to 'next'?
|
||||
|
||||
* mr/gitweb-snapshot (2009-11-07) 4 commits.
|
||||
(merged to 'next' on 2009-11-21 at e825ad9)
|
||||
+ gitweb: Smarter snapshot names
|
||||
+ gitweb: Document current snapshot rules via new tests
|
||||
+ t/gitweb-lib.sh: Split gitweb output into headers and body
|
||||
(merged to 'next' on 2009-10-11 at 22ba047)
|
||||
+ gitweb: check given hash before trying to create snapshot
|
||||
|
||||
Soon in 'master'.
|
||||
|
||||
* jc/pretty-lf (2009-10-04) 1 commit.
|
||||
- Pretty-format: %[+-]x to tweak inter-item newlines
|
||||
|
||||
* ks/precompute-completion (2009-11-15) 4 commits.
|
||||
(merged to 'next' on 2009-11-15 at 23cdb96)
|
||||
+ Revert ks/precompute-completion series
|
||||
(merged to 'next' on 2009-10-28 at cd5177f)
|
||||
+ completion: ignore custom merge strategies when pre-generating
|
||||
(merged to 'next' on 2009-10-22 at f46a28a)
|
||||
+ bug: precomputed completion includes scripts sources
|
||||
(merged to 'next' on 2009-10-14 at adf722a)
|
||||
+ Speedup bash completion loading
|
||||
|
||||
Reverted out of 'next', to be replaced with jn/faster-completion-startup
|
||||
topic.
|
||||
|
||||
* nd/sparse (2009-08-20) 19 commits.
|
||||
- sparse checkout: inhibit empty worktree
|
||||
- Add tests for sparse checkout
|
||||
@@ -540,7 +489,8 @@ up-to-date. I haven't described this at the beginning of this message
|
||||
yet, as it is not clear if this change is even necessary. Opinions?
|
||||
|
||||
* jk/1.7.0-status (2009-09-05) 5 commits.
|
||||
- docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-11-21 at 884bb56)
|
||||
+ docs: note that status configuration affects only long format
|
||||
(merged to 'next' on 2009-10-11 at 65c8513)
|
||||
+ commit: support alternate status formats
|
||||
+ status: add --porcelain output format
|
||||
@@ -551,10 +501,6 @@ yet, as it is not clear if this change is even necessary. Opinions?
|
||||
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
|
||||
is similar to that of post 1.7.0 "git status".
|
||||
|
||||
The tip one is not in 'next' as I have been hoping that somebody may want
|
||||
to change the code to make it unnecessary, but it does not seem to be
|
||||
happening, so probably it should also go to 'next'.
|
||||
|
||||
* jc/1.7.0-status (2009-09-05) 4 commits.
|
||||
(merged to 'next' on 2009-10-11 at 9558627)
|
||||
+ status: typo fix in usage
|
||||
|
||||
Reference in New Issue
Block a user