Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'.
The main part of this cycle is expected to run thru May, aiming for a
feature freeze in early June.
The week #2 of this cycle starts on May 2nd.
--------------------------------------------------
[New Topics]
* im/hashcmp-optim (2011-04-28) 1 commit
- hashcmp(): inline memcmp() by hand to optimize
Will merge to "next".
* jc/add-delete-default (2011-04-19) 1 commit
- git add: notice removal of tracked paths by default
(this branch uses jc/fix-add-u-unmerged, jc/fix-add-u-unmerged and jc/fix-diff-files-unmerged.)
* kk/maint-prefix-in-config-mak (2011-04-28) 1 commit
- Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
Wait for msysgit folks to Ack, and then merge to "next".
* sg/completion-updates (2011-04-28) 3 commits
- completion: don't declare 'local words' to make zsh happy
- completion: remove unnecessary _get_comp_words_by_ref() invocations
- completion: don't modify the $cur variable in completion functions
Will merge to "next".
* jk/merge-one-file-working-tree (2011-04-29) 2 commits
- merge-one-file: fix broken merges with alternate work trees
- add tests for merge-index / merge-one-file
Will merge to "next".
* js/blame-parsename (2011-04-21) 1 commit
(merged to 'next' on 2011-04-29 at 5fde945)
+ blame: tolerate bogus e-mail addresses a bit better
Will merge to "master" by the end of week #2.
* jn/ctags (2011-04-29) 6 commits
- gitweb: Optional grouping of projects by category
- gitweb: Modularized git_get_project_description to be more generic
- gitweb: Split git_project_list_body in two functions
- gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
- gitweb: Change the way "content tags" ('ctags') are handled
- gitweb: Restructure projects list generation
* js/info-man-path (2011-05-01) 1 commit
- git: add --info-path and --man-path options
* cj/p4merge (2011-05-01) 1 commit
- Pass empty file to p4merge where no base is suitable.
--------------------------------------------------
[Graduated to "master"]
* en/merge-recursive (2011-03-17) 4 commits
(merged to 'next' on 2011-04-25 at 8027acd)
+ merge-recursive: tweak magic band-aid
+ merge-recursive: When we detect we can skip an update, actually skip it
+ t6022: New test checking for unnecessary updates of files in D/F conflicts
+ t6022: New test checking for unnecessary updates of renamed+modified files
* jc/diff-irreversible-delete (2011-02-28) 1 commit
(merged to 'next' on 2011-04-25 at c37610d)
+ git diff -D: omit the preimage of deletes
* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
(merged to 'next' on 2011-04-25 at 25c195e)
+ diffcore-rename: fall back to -C when -C -C busts the rename limit
+ diffcore-rename: record filepair for rename src
+ diffcore-rename: refactor "too many candidates" logic
+ builtin/diff.c: remove duplicated call to diff_result_code()
* jh/dirstat (2011-04-12) 4 commits
(merged to 'next' on 2011-04-25 at cb277e6)
+ --dirstat: In case of renames, use target filename instead of source filename
+ Teach --dirstat not to completely ignore rearranged lines within a file
+ --dirstat-by-file: Make it faster and more correct
+ --dirstat: Describe non-obvious differences relative to --stat or regular diff
(this branch is used by jh/dirstat-lines.)
* mz/rebase (2011-02-28) 34 commits
(merged to 'next' on 2011-04-25 at 4bbed46)
+ rebase: define options in OPTIONS_SPEC
+ Makefile: do not install sourced rebase scripts
+ rebase: use @{upstream} if no upstream specified
+ rebase -i: remove unnecessary state rebase-root
+ rebase -i: don't read unused variable preserve_merges
+ git-rebase--am: remove unnecessary --3way option
+ rebase -m: don't print exit code 2 when merge fails
+ rebase -m: remember allow_rerere_autoupdate option
+ rebase: remember strategy and strategy options
+ rebase: remember verbose option
+ rebase: extract code for writing basic state
+ rebase: factor out sub command handling
+ rebase: make -v a tiny bit more verbose
+ rebase -i: align variable names
+ rebase: show consistent conflict resolution hint
+ rebase: extract am code to new source file
+ rebase: extract merge code to new source file
+ rebase: remove $branch as synonym for $orig_head
+ rebase -i: support --stat
+ rebase: factor out call to pre-rebase hook
+ rebase: factor out clean work tree check
+ rebase: factor out reference parsing
+ rebase: reorder validation steps
+ rebase -i: remove now unnecessary directory checks
+ rebase: factor out command line option processing
+ rebase: align variable content
+ rebase: align variable names
+ rebase: stricter check of standalone sub command
+ rebase: act on command line outside parsing loop
+ rebase: improve detection of rebase in progress
+ rebase: remove unused rebase state 'prev_head'
+ rebase: read state outside loop
+ rebase: refactor reading of state
+ rebase: clearer names for directory variables
* rs/strbuf-setlen-assert (2011-04-27) 1 commit
(merged to 'next' on 2011-04-28 at d1e8d0d)
+ strbuf: clarify assertion in strbuf_setlen()
Will merge to "master" by the end of week #1.
* sp/maint-clear-postfields (2011-04-26) 1 commit
(merged to 'next' on 2011-04-26 at 0082503)
+ http: clear POSTFIELDS when initializing a slot
Fixes a rather nasty bug we had since the beginning of smart-HTTP
but has become a lot easier to trigger since 1.7.5, introducing a
regression.
* vh/git-svn-doc (2011-04-26) 3 commits
(merged to 'next' on 2011-04-28 at 5556e8c)
+ git-svn.txt: small typeface improvements
+ git-svn.txt: move option descriptions
+ git-svn.txt: fix usage of --add-author-from
Will merge to "master" by the end of week #1.
--------------------------------------------------
[Stalled]
* jn/gitweb-js (2011-04-28) 13 commits
- gitweb: Make JavaScript ability to adjust timezones configurable
- gitweb.js: Add UI for selecting common timezone to display dates
- gitweb: JavaScript ability to adjust time based on timezone
- gitweb: Unify the way long timestamp is displayed
- gitweb: Refactor generating of long dates into format_timestamp_html
- gitweb.js: Provide getElementsByClassName method (if it not exists)
- gitweb.js: Introduce code to handle cookies from JavaScript
- gitweb.js: Extract and improve datetime handling
- gitweb.js: Provide default values for padding in padLeftStr and padLeft
- gitweb.js: Update and improve comments in JavaScript files
- gitweb: Split JavaScript for maintability, combining on build
- Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
- git-instaweb: Simplify build dependency on gitweb
Rerolled. Waiting for comments.
* jk/maint-merge-rename-create (2011-03-25) 3 commits
- merge: turn on rewrite detection
- merge: handle renames with replacement content
- t3030: fix accidental success in symlink rename
Peff wanted to reroll this, so this is taken out of "next".
* dm/http-cleanup (2011-03-30) 2 commits
- http-push: refactor curl_easy_setup madness
- http: make curl callbacks match contracts from curl header
The second one will probably need re-rolling on top of
sp/maint-clear-postfields after it settles.
* rr/rerere-clear-libify (2011-04-13) 1 commit
- rerere: Expose an API corresponding to 'clear' functionality
Jonathan had good comments on moving the garbage collection interface as
well. Perhaps needs a re-roll.
* jc/index-pack (2011-02-25) 5 commits
- index-pack --verify: read anomalous offsets from v2 idx file
- write_idx_file: need_large_offset() helper function
- index-pack: --verify
- write_idx_file: introduce a struct to hold idx customization options
- index-pack: group the delta-base array entries also by type
Still a WIP. Need to put histogram output into index-pack --verify to
really kill verify-pack.
* jk/tag-contains (2010-07-05) 4 commits
- Why is "git tag --contains" so slow?
- default core.clockskew variable to one day
- limit "contains" traversals based on commit timestamp
- tag: speed up --contains calculation
The idea of the bottom one is probably Ok, except that the use of object
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.
--------------------------------------------------
[Cooking]
* gr/cvsimport-alternative-cvspass-location (2011-05-01) 1 commit
- Look for password in both CVS and CVSNT password files.
* jc/maint-add-p-overlapping-hunks (2011-04-06) 4 commits
- "add -p": work-around an old laziness that does not coalesce hunks
- add--interactive.perl: factor out repeated --recount option
- t3701: Editing a split hunk in an "add -p" session
- add -p: 'q' should really quit
Now out of "Stalled" category with tests.
* ld/p4-preserve-user-names (2011-04-21) 1 commit
(merged to 'next' on 2011-04-29 at 25116c8)
+ git-p4: add option to preserve user names
Will merge to "master" by the end of week #2.
* jh/dirstat-lines (2011-04-29) 8 commits
(merged to 'next' on 2011-04-29 at a302674)
+ Mark dirstat error messages for translation
+ Improve error handling when parsing dirstat parameters
+ New --dirstat=lines mode, doing dirstat analysis based on diffstat
+ Allow specifying --dirstat cut-off percentage as a floating point number
+ Add config variable for specifying default --dirstat behavior
+ Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
+ Make --dirstat=0 output directories that contribute < 0.1% of changes
+ Add several testcases for --dirstat and friends
* aw/maint-rebase-i-p-no-ff (2011-04-28) 1 commit
- git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
Will merge to "next".
* mg/alias-expose-prefix (2011-04-27) 2 commits
- handle_alias: provide GIT_PREFIX to !alias
- t1020: test !alias in subdirectory
Will merge to "next".
* mg/diff-uiconfig-doc (2011-04-27) 1 commit
- config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
Will merge to "next".
* mg/rev-list-count-cherry (2011-04-26) 1 commit
(merged to 'next' on 2011-04-26 at dc3e80a)
+ rev-list --count: separate count for --cherry-mark
Will merge to "master" by the end of week #2.
* ft/gitweb-tar-with-gzip-n (2011-04-26) 1 commit
(merged to 'next' on 2011-04-26 at 8e59a0e)
+ gitweb: supply '-n' to gzip for identical output
Will merge to "master" by the end of week #2.
* ml/test-readme (2011-04-26) 1 commit
(merged to 'next' on 2011-04-26 at d1efe84)
+ t/README: unify documentation of test function args
Will merge to "master" by the end of week #2.
* jk/format-patch-quote-special-in-from (2011-04-08) 1 commit
(merged to 'next' on 2011-04-28 at 587f2d4)
+ pretty: quote rfc822 specials in email addresses
Will merge to "master" by the end of week #2.
* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits
(merged to 'next' on 2011-04-28 at 6006cc4)
+ revisions: allow --glob and friends in parse_options-enabled commands
+ revisions: split out handle_revision_pseudo_opt function
* cn/log-parse-opt (2011-04-14) 1 commit
(merged to 'next' on 2011-04-28 at 02f2eac)
+ log: convert to parse-options
* jc/fix-add-u-unmerged (2011-04-20) 1 commit
(merged to 'next' on 2011-04-28 at f7ed821)
+ Fix "add -u" that sometimes fails to resolve unmerged paths
(this branch is used by jc/add-delete-default and jc/add-delete-default; uses jc/fix-diff-files-unmerged.)
* jc/fix-diff-files-unmerged (2011-04-22) 4 commits
(merged to 'next' on 2011-04-28 at f1f837c)
+ diff-files: show unmerged entries correctly
+ diff: remove often unused parameters from diff_unmerge()
+ diff.c: return filepair from diff_unmerge()
+ test: use $_z40 from test-lib
(this branch is used by jc/add-delete-default and jc/fix-add-u-unmerged.)
* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
+ send-pack: avoid deadlock when pack-object dies early
(this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)
* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
(merged to 'next' on 2011-04-28 at db7e04a)
+ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
(this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)
Will merge to "master" by the end of week #2.
* jk/format-patch-multiline-header (2011-04-14) 1 commit
(merged to 'next' on 2011-04-26 at 3d5eda3)
+ format-patch: wrap email addresses after long names
Will merge to "master" by the end of week #2.
* jn/maint-format-patch-doc (2011-04-14) 1 commit
(merged to 'next' on 2011-04-26 at 400cf42)
+ Documentation: describe the format of messages with inline patches
(this branch is used by jn/format-patch-doc.)
Will merge to "master" by the end of week #2.
* jn/format-patch-doc (2011-04-18) 6 commits
(merged to 'next' on 2011-04-26 at 3f64325)
+ Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
+ Documentation: publicize hints for sending patches with GMail
+ Documentation: publicize KMail hints for sending patches inline
+ Documentation: hints for sending patches inline with Thunderbird
+ Documentation: explain how to check for patch corruption
+ Merge v1.7.5-rc2 into jn/format-patch-doc
(this branch uses jn/maint-format-patch-doc.)
Will merge to "master" by the end of week #2.
* jn/run-command-error-failure (2011-04-20) 2 commits
(merged to 'next' on 2011-04-26 at a1f171e)
+ run-command: handle short writes and EINTR in die_child
+ tests: check error message from run_command
Will merge to "master" by the end of week #2.
* ss/cherry-pick-x-doc (2011-04-15) 1 commit
(merged to 'next' on 2011-04-26 at c9a6f83)
+ doc: Clarify that "cherry-pick -x" does not use "git notes"
Will merge to "master" by the end of week #2.
* ss/doc-svn (2011-04-19) 1 commit
(merged to 'next' on 2011-04-26 at a723b91)
+ remove noise and inaccuracies from git-svn docs
Will merge to "master" by the end of week #2.
* vr/merge-base-doc (2011-04-15) 2 commits
(merged to 'next' on 2011-04-26 at e906ba3)
+ Restructure documentation for git-merge-base.
+ Documentation: update to git-merge-base --octopus
Will merge to "master" by the end of week #2.
* jm/mergetool-submodules (2011-04-13) 1 commit
(merged to 'next' on 2011-04-26 at 40892cf)
+ mergetool: Teach about submodules
Will merge to "master" by the end of week #2.
* ab/i18n-fixup (2011-04-14) 24 commits
(merged to 'next' on 2011-04-25 at 32fef07)
+ i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
+ i18n: use test_i18n{grep,cmp} in t7508
+ i18n: use test_i18ngrep in t7506
+ i18n: use test_i18ngrep and test_i18ncmp in t7502
+ i18n: use test_i18ngrep in t7501
+ i18n: use test_i18ncmp in t7500
+ i18n: use test_i18ngrep in t7201
+ i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
+ i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
+ i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
+ i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
+ i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
+ i18n: use test_i18ngrep in lib-httpd and t2019
+ i18n: do not overuse C_LOCALE_OUTPUT (grep)
+ i18n: use test_i18ncmp in t1200 and t2200
+ i18n: .git file is not a human readable message (t5601)
+ i18n: do not overuse C_LOCALE_OUTPUT
+ i18n: mark init-db messages for translation
+ i18n: mark checkout plural warning for translation
+ i18n: mark checkout --detach messages for translation
+ i18n: mark clone nonexistent repository message for translation
+ i18n: mark merge CHERRY_PICK_HEAD messages for translation
+ i18n: mark merge "upstream" messages for translation
+ i18n: mark merge "Could not read from" message for translation
Will merge to "master" by the end of week #2.
* nm/submodule-update-force (2011-04-01) 1 commit
(merged to 'next' on 2011-04-25 at 270fffc)
+ submodule: Add --force option for git submodule update
Will merge to "master" by the end of week #2.
* jh/notes-add-ui (2011-03-30) 1 commit
(merged to 'next' on 2011-04-25 at 4fb1ac2)
+ Make "git notes add" more user-friendly when there are existing notes
Will merge to "master" by the end of week #2.
* jk/notes-ui-updates (2011-04-14) 8 commits
(merged to 'next' on 2011-04-25 at 4216d33)
+ contrib/completion: --notes, --no-notes
+ log/pretty-options: Document --[no-]notes and deprecate old notes options
+ revision.c: make --no-notes reset --notes list
+ revision.c: support --notes command-line option
+ notes: refactor display notes default handling
+ notes: refactor display notes extra refs field
+ revision.c: refactor notes ref expansion
+ notes: make expand_notes_ref globally accessible
Will merge to "master" by the end of week #2.
* nd/maint-setup (2011-03-26) 2 commits
(merged to 'next' on 2011-04-25 at fd45c63)
+ Kill off get_relative_cwd()
+ setup: return correct prefix if worktree is '/'
Will merge to "master" by the end of week #2.
* mz/maint-rename-unmerged (2011-03-23) 1 commit
(merged to 'next' on 2011-04-25 at 038a8c3)
+ diffcore-rename: don't consider unmerged path as source
Will merge to "master" by the end of week #2.
* nd/struct-pathspec (2011-04-05) 5 commits
(merged to 'next' on 2011-04-25 at 65dbe80)
+ pathspec: rename per-item field has_wildcard to use_wildcard
+ Improve tree_entry_interesting() handling code
+ Convert read_tree{,_recursive} to support struct pathspec
+ Reimplement read_tree_recursive() using tree_entry_interesting()
+ Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
Will merge to "master" by the end of week #2.
* jc/magic-pathspec (2011-04-06) 3 commits
(merged to 'next' on 2011-04-25 at 788cd46)
+ magic pathspec: add ":(icase)path" to match case insensitively
+ magic pathspec: futureproof shorthand form
+ magic pathspec: add tentative ":/path/from/top/level" pathspec support
Thanks to Peff, Duy, and Michael for helping to whip the syntax and the
basic semantics into a not-so-horrible shape.
Will merge to "master" by the end of week #2.
--------------------------------------------------
[Discarded]
* mg/show-without-prune (2011-04-01) 1 commit
. builtin/show: do not prune by pathspec
I wanted to like this, but it still feels like too much magic. Will wait
for the topic to resurface.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html