Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'.
Just a note. I am at OSCON this week and my response/patch processing
bandwidth is limited.
--------------------------------------------------
[New Topics]
* jc/streaming-filter (2011-07-22) 1 commit
(merged to 'next' on 2011-07-22 at 2081cd7)
+ streaming: free git_istream upon closing
A large leak found and plugged.
Will merge to "master".
* jn/gitweb-system-config (2011-07-24) 1 commit
- gitweb: Introduce common system-wide settings for convenience
* js/ls-tree-error (2011-07-25) 2 commits
- Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
- Add a test to check that git ls-tree sets non-zero exit code on error.
* jc/merge-reword (2011-05-25) 2 commits
- merge: mark the final "Merge made by..." message for l10n
- merge: reword the final message
Probably the topmost commit should be dropped.
* jk/reset-reflog-message-fix (2011-07-22) 1 commit
- reset: give better reflog messages
Will merge to "next".
* jk/add-i-hunk-filter (2011-07-27) 5 commits
- add--interactive: add option to autosplit hunks
- add--interactive: allow negatation of hunk filters
- add--interactive: allow hunk filtering on command line
- add--interactive: factor out regex error handling
- add--interactive: refactor patch mode argument processing
* mh/check-attr-listing (2011-07-27) 19 commits
- Rename struct git_attr_check to git_attr_value
- git-check-attr: Fix command-line handling to match docs
- git-check-attr: Drive two tests using the same raw data
- git-check-attr: Add an --all option to show all attributes
- git-check-attr: Error out if no pathnames are specified
- git-check-attr: Process command-line args more systematically
- git-check-attr: Handle each error separately
- git-check-attr: Extract a function error_with_usage()
- git-check-attr: Introduce a new variable
- git-check-attr: Extract a function output_attr()
- Allow querying all attributes on a file
- git-check-attr: Use git_attr_name()
- Provide access to the name attribute of git_attr
- git-check-attr: Add tests of command-line parsing
- git-check-attr: Add missing "&&"
- Disallow the empty string as an attribute name
- Remove anachronism from comment
- doc: Correct git_attr() calls in example code
- doc: Add a link from gitattributes(5) to git-check-attr(1)
--------------------------------------------------
[Graduated to "master"]
* bw/log-all-ref-updates-doc (2011-07-12) 1 commit
(merged to 'next' on 2011-07-14 at 31b80a8)
+ Documentation: clearly specify what refs are honored by core.logAllRefUpdates
* dc/stash-con-untracked (2011-06-26) 1 commit
(merged to 'next' on 2011-07-13 at 9ed0d1d)
+ stash: Add --include-untracked option to stash and remove all untracked files
* dz/connect-error-report (2011-07-14) 1 commit
(merged to 'next' on 2011-07-14 at bf1c775)
+ Do not log unless all connect() attempts fail
* jc/checkout-reflog-fix (2011-07-06) 3 commits
(merged to 'next' on 2011-07-14 at 5982cdd)
+ Merge commit 'v1.7.6' into jc/checkout-reflog-fix
+ Merge commit 'v1.7.0' into jc/checkout-reflog-fix
+ Merge commit 'v1.6.0' into jc/checkout-reflog-fix
(this branch uses jc/maint-checkout-reflog-fix.)
* jc/maint-checkout-reflog-fix (2011-07-06) 1 commit
+ checkout: do not write bogus reflog entry out
(this branch is used by jc/checkout-reflog-fix.)
* jc/maint-mergetool-read-fix (2011-07-01) 1 commit
(merged to 'next' on 2011-07-14 at 2056a67)
+ mergetool: check return value from read
* jk/tag-contains-ab (2011-07-14) 5 commits
(merged to 'next' on 2011-07-14 at 002a9d7)
+ Revert clock-skew based attempt to optimize tag --contains traversal
+ git skew: a tool to find how big a clock skew exists in the history
(merged to 'next' on 2011-07-05 at f9cf575)
+ default core.clockskew variable to one day
+ limit "contains" traversals based on commit timestamp
+ tag: speed up --contains calculation
(this branch is tangled with jk/generation-numbers.)
Reverted the commits near the tip.
* jl/submodule-add-relurl-wo-upstream (2011-06-06) 3 commits
(merged to 'next' on 2011-07-13 at f989abb)
+ submodule add: clean up duplicated code
+ submodule add: allow relative repository path even when no url is set
+ submodule add: test failure when url is not configured in superproject
* jn/gitweb-search (2011-06-22) 4 commits
(merged to 'next' on 2011-07-13 at 455acdd)
+ gitweb: Make git_search_* subroutines render whole pages
+ gitweb: Clean up code in git_search_* subroutines
+ gitweb: Split body of git_search into subroutines
+ gitweb: Check permissions first in git_search
* js/maint-add-path-stat-pwd (2011-07-11) 1 commit
(merged to 'next' on 2011-07-14 at c6fef9d)
+ get_pwd_cwd(): Do not trust st_dev/st_ino blindly
* ms/help-unknown (2011-07-08) 1 commit
(merged to 'next' on 2011-07-14 at d7976b4)
+ help_unknown_cmd: do not propose an "unknown" cmd
* mz/doc-rebase-abort (2011-07-13) 1 commit
(merged to 'next' on 2011-07-14 at a1a612c)
+ rebase: clarify "restore the original branch"
* mz/doc-synopsis-verse (2011-07-06) 1 commit
(merged to 'next' on 2011-07-14 at 34d45e2)
+ Documentation: use [verse] for SYNOPSIS sections
--------------------------------------------------
[Stalled]
* nk/branch-v-abbrev (2011-07-01) 1 commit
- branch -v: honor core.abbrev
Perhaps needs an updated commit log message?
* di/fast-import-doc (2011-07-13) 2 commits
- doc/fast-import: document feature import-marks-if-exists
- doc/fast-import: clarify notemodify command
Comments from fast-import folks?
* jh/receive-count-limit (2011-05-23) 10 commits
- receive-pack: Allow server to refuse pushes with too many objects
- pack-objects: Estimate pack size; abort early if pack size limit is exceeded
- send-pack/receive-pack: Allow server to refuse pushing too large packs
- pack-objects: Allow --max-pack-size to be used together with --stdout
- send-pack/receive-pack: Allow server to refuse pushes with too many commits
- pack-objects: Teach new option --max-commit-count, limiting #commits in pack
- receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
- Tighten rules for matching server capabilities in server_supports()
- send-pack: Attempt to retrieve remote status even if pack-objects fails
- Update technical docs to reflect side-band-64k capability in receive-pack
Would need another round to separate per-pack and per-session limits.
* jm/mergetool-pathspec (2011-06-22) 2 commits
- mergetool: Don't assume paths are unmerged
- mergetool: Add tests for filename with whitespace
I think this is a good idea, but it probably needs a re-roll.
Cf. $gmane/176254, 176255, 166256
* jk/generation-numbers (2011-07-14) 7 commits
- limit "contains" traversals based on commit generation
- check commit generation cache validity against grafts
- pretty: support %G to show the generation number of a commit
- commit: add commit_generation function
- add metadata-cache infrastructure
- decorate: allow storing values instead of pointers
- Merge branch 'jk/tag-contains-ab' (early part) into HEAD
The initial "tag --contains" de-pessimization without need for generation
numbers is already in; backburnered.
--------------------------------------------------
[Cooking]
* jc/maint-reset-unmerged-path (2011-07-13) 1 commit
(merged to 'next' on 2011-07-19 at bbc2d54)
+ reset [<commit>] paths...: do not mishandle unmerged paths
(this branch is used by jc/diff-index-refactor.)
Will merge to "master".
* jc/diff-index-refactor (2011-07-13) 2 commits
- diff-lib: refactor run_diff_index() and do_diff_cache()
- diff-lib: simplify do_diff_cache()
(this branch uses jc/maint-reset-unmerged-path.)
* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
- t5800: point out that deleting branches does not work
- t5800: document inability to push new branch with old content
(this branch uses sr/transport-helper-fix.)
* vi/make-test-vector-less-specific (2011-07-19) 1 commit
(merged to 'next' on 2011-07-25 at 1973192)
+ tests: cleanup binary test vector files
* jk/http-auth-keyring (2011-07-21) 14 commits
- credentials: add "getpass" helper
- credentials: add "store" helper
- credentials: add "cache" helper
- docs: end-user documentation for the credential subsystem
- http: use hostname in credential description
- allow the user to configure credential helpers
- look for credentials in config before prompting
- http: use credential API to get passwords
- fixup! introduce credentials API
- introduce credentials API
- http: retry authentication failures for all http requests
- remote-curl: don't retry auth failures with dumb protocol
- improve httpd auth tests
- url: decode buffers that are not NUL-terminated
Looked mostly reasonable except for the limitation that it is not clear
how to deal with a site at which a user needs to use different passwords
for different repositories.
* tc/minix (2011-07-20) 1 commit
(merged to 'next' on 2011-07-25 at 36ad29f)
+ Makefile: add Minix configuration options.
* sr/transport-helper-fix (2011-07-19) 21 commits
(merged to 'next' on 2011-07-19 at e1ef414)
+ transport-helper: die early on encountering deleted refs
+ transport-helper: implement marks location as capability
+ transport-helper: Use capname for refspec capability too
+ transport-helper: change import semantics
+ transport-helper: update ref status after push with export
+ transport-helper: use the new done feature where possible
+ transport-helper: check status code of finish_command
+ transport-helper: factor out push_update_refs_status
+ fast-export: support done feature
+ fast-import: introduce 'done' command
+ git-remote-testgit: fix error handling
+ git-remote-testgit: only push for non-local repositories
+ remote-curl: accept empty line as terminator
+ remote-helpers: export GIT_DIR variable to helpers
+ git_remote_helpers: push all refs during a non-local export
+ transport-helper: don't feed bogus refs to export push
+ git-remote-testgit: import non-HEAD refs
+ t5800: document some non-functional parts of remote helpers
+ t5800: use skip_all instead of prereq
+ t5800: factor out some ref tests
+ transport-helper: fix minor leak in push_refs_with_export
(this branch is used by sr/transport-helper-fix-rfc.)
Will merge to "master".
* jk/clone-detached (2011-06-07) 4 commits
(merged to 'next' on 2011-07-25 at 013d7d0)
+ clone: always fetch remote HEAD
+ make copy_ref globally available
+ consider only branches in guess_remote_head
+ t: add tests for cloning remotes with detached HEAD
Will merge to "master".
* jc/pack-order-tweak (2011-07-08) 2 commits
(merged to 'next' on 2011-07-25 at 1460c31)
+ pack-objects: optimize "recency order"
+ core: log offset pack data accesses happened
* js/ref-namespaces (2011-07-21) 5 commits
(merged to 'next' on 2011-07-25 at 5b7dcfe)
+ ref namespaces: tests
+ ref namespaces: documentation
+ ref namespaces: Support remote repositories via upload-pack and receive-pack
+ ref namespaces: infrastructure
+ Fix prefix handling in ref iteration functions
* rc/histogram-diff (2011-07-12) 7 commits
(merged to 'next' on 2011-07-25 at 3351028)
+ xdiff/xprepare: use a smaller sample size for histogram diff
+ xdiff/xprepare: skip classification
+ teach --histogram to diff
+ t4033-diff-patience: factor out tests
+ xdiff/xpatience: factor out fall-back-diff function
+ xdiff/xprepare: refactor abort cleanups
+ xdiff/xprepare: use memset()
* rr/revert-cherry-pick-continue (2011-07-27) 18 commits
- revert: Introduce --continue to continue the operation
- revert: Don't implictly stomp pending sequencer operation
- revert: Remove sequencer state when no commits are pending
- reset: Make reset remove the sequencer state
- revert: Introduce --reset to remove sequencer state
- revert: Make pick_commits functionally act on a commit list
- revert: Save command-line options for continuing operation
- revert: Save data for continuing after conflict resolution
- revert: Don't create invalid replay_opts in parse_args
- revert: Separate cmdline parsing from functional code
- revert: Introduce struct to keep command-line options
- revert: Eliminate global "commit" variable
- revert: Propogate errors upwards from do_pick_commit
- revert: Rename no_replay to record_origin
- revert: Don't check lone argument in get_encoding
- revert: Simplify and inline add_message_to_msg
- config: Introduce functions to write non-standard file
- advice: Introduce error_resolve_conflict
* en/merge-recursive (2011-07-14) 50 commits
- fixup! Do not assume that qsort is stable
- t3030: fix accidental success in symlink rename
- merge-recursive: Fix working copy handling for rename/rename/add/add
- merge-recursive: add handling for rename/rename/add-dest/add-dest
- merge-recursive: Have conflict_rename_delete reuse modify/delete code
- merge-recursive: Make modify/delete handling code reusable
- merge-recursive: Consider modifications in rename/rename(2to1) conflicts
- merge-recursive: Create function for merging with branchname:file markers
- merge-recursive: Record more data needed for merging with dual renames
- merge-recursive: Defer rename/rename(2to1) handling until process_entry
- merge-recursive: Small cleanups for conflict_rename_rename_1to2
- merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
- merge-recursive: Introduce a merge_file convenience function
- merge-recursive: Fix modify/delete resolution in the recursive case
- merge-recursive: Provide more info in conflict markers with file renames
- merge-recursive: Cleanup and consolidation of rename_conflict_info
- merge-recursive: Consolidate process_entry() and process_df_entry()
- merge-recursive: Improve handling of rename target vs. directory addition
- merge-recursive: Add comments about handling rename/add-source cases
- merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
- merge-recursive: Fix deletion of untracked file in rename/delete conflicts
- merge-recursive: When we detect we can skip an update, actually skip it
- merge-recursive: Split update_stages_and_entry; only update stages at end
- merge-recursive: Consolidate different update_stages functions
- merge-recursive: Allow make_room_for_path() to remove D/F entries
- merge-recursive: Split was_tracked() out of would_lose_untracked()
- merge-recursive: Save D/F conflict filenames instead of unlinking them
- merge-recursive: Fix code checking for D/F conflicts still being present
- merge-recursive: Fix sorting order and directory change assumptions
- merge-recursive: Fix recursive case with D/F conflict via add/add conflict
- merge-recursive: Avoid working directory changes during recursive case
- merge-recursive: Remember to free generated unique path names
- merge-recursive: Mark some diff_filespec struct arguments const
- merge-recursive: Correct a comment
- merge-recursive: Make BUG message more legible by adding a newline
- t6022: Add testcase for merging a renamed file with a simple change
- t6022: New tests checking for unnecessary updates of files
- t6022: Remove unnecessary untracked files to make test cleaner
- t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
- t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
- t6036: tests for criss-cross merges with various directory/file conflicts
- t6036: criss-cross with weird content can fool git into clean merge
- t6036: Add differently resolved modify/delete conflict in criss-cross test
- t6042: Ensure rename/rename conflicts leave index and workdir in sane state
- t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
- t6042: Add tests for content issues with modify/rename/directory conflicts
- t6042: Add a testcase where undetected rename causes silent file deletion
- t6042: Add a pair of cases where undetected renames cause issues
- t6042: Add failing testcase for rename/modify/add-source conflict
- t6042: Add a testcase where git deletes an untracked file
Looked at up to 38/48; looks basically sound.
--
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