What's cooking (2011/08 #02)
Junio C Hamano
parent
4350a1ca1e
commit
30e2727199
|
|
@ -1,9 +1,9 @@
|
|||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Aug 2011, #01; Wed, 3)
|
||||
X-master-at: 6a319e393b856461bab89ffe332a02e71befee40
|
||||
X-next-at: b06e80e736fa17ec470db045b45ab3a5e6a5bd3a
|
||||
Subject: What's cooking in git.git (Aug 2011, #02; Mon, 8)
|
||||
X-master-at: 1421fd9df4f1e3ed232bd1c683c6e264a464a41e
|
||||
X-next-at: 917d73bc85e756fc5d627c398a3b2aaebc3cf157
|
||||
|
||||
What's cooking in git.git (Aug 2011, #01; Wed, 3)
|
||||
What's cooking in git.git (Aug 2011, #02; Mon, 8)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
|
|
@ -13,44 +13,43 @@ There are a few 'fixup!' commits queued in topics still in 'pu', so that
|
|||
authors have a choice to just say "that fix looks good, squash it in!"
|
||||
instead of going through an extra round.
|
||||
|
||||
I should start making noises about the feature freeze by now, but with a
|
||||
vacation week in the US early in July, my half-absense during OSCON last
|
||||
week, and just because it is summer in general, this round is going slower
|
||||
than planned. Let's shoot for the feature freeze in two weeks and decide
|
||||
which stragglers to postpone to the next round.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
[Graduated to "master"]
|
||||
|
||||
* ac/describe-dirty-refresh (2011-08-01) 2 commits
|
||||
- fixup! describe: Refresh the index when run with --dirty
|
||||
- describe: Refresh the index when run with --dirty
|
||||
* jc/diff-index-refactor (2011-07-13) 2 commits
|
||||
(merged to 'next' on 2011-08-01 at 98d8b08)
|
||||
+ diff-lib: refactor run_diff_index() and do_diff_cache()
|
||||
+ diff-lib: simplify do_diff_cache()
|
||||
|
||||
* cb/maint-ls-files-error-report (2011-08-01) 2 commits
|
||||
- squash! ls-files: fix pathspec display on error
|
||||
- ls-files: fix pathspec display on error
|
||||
* 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
|
||||
|
||||
* ef/ipv4-connect-error-report (2011-08-01) 2 commits
|
||||
(merged to 'next' on 2011-08-03 at ea4842b)
|
||||
+ connect: only log if all attempts failed (ipv4)
|
||||
+ Merge branch 'maint' into ef/ipv4-connect-error-report
|
||||
* jk/reset-reflog-message-fix (2011-07-22) 1 commit
|
||||
(merged to 'next' on 2011-08-01 at 6c88837)
|
||||
+ reset: give better reflog messages
|
||||
|
||||
* jl/submodule-status-summary-doc (2011-08-01) 1 commit
|
||||
(merged to 'next' on 2011-08-03 at 88f97a9)
|
||||
+ Documentation/submodule: add command references and update options
|
||||
|
||||
* js/bisect-no-checkout (2011-08-03) 9 commits
|
||||
- bisect: add documentation for --no-checkout option.
|
||||
- fixup! bisect: add tests for the --no-checkout option
|
||||
- bisect: add tests for the --no-checkout option.
|
||||
- fixup! bisect: introduce --no-checkout support into porcelain
|
||||
- bisect: introduce --no-checkout support into porcelain.
|
||||
- bisect: introduce support for --no-checkout option.
|
||||
- bisect: add tests to document expected behaviour in presence of broken trees.
|
||||
- bisect: use && to connect statements that are deferred with eval.
|
||||
- bisect: move argument parsing before state modification.
|
||||
* jl/submodule-update-quiet (2011-07-28) 1 commit
|
||||
(merged to 'next' on 2011-08-01 at c611587)
|
||||
+ submodule: update and add must honor --quiet flag
|
||||
|
||||
Getting there; I have a couple of trivial fix-ups queued there, though.
|
||||
* jn/gitweb-config-list-case (2011-07-31) 1 commit
|
||||
(merged to 'next' on 2011-08-01 at 9268738)
|
||||
+ gitweb: Git config keys are case insensitive, make config search too
|
||||
|
||||
* jn/gitweb-system-config (2011-07-24) 1 commit
|
||||
(merged to 'next' on 2011-08-01 at 4941e45)
|
||||
+ gitweb: Introduce common system-wide settings for convenience
|
||||
|
||||
* js/ls-tree-error (2011-07-25) 2 commits
|
||||
(merged to 'next' on 2011-08-01 at 61bae55)
|
||||
+ 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.
|
||||
|
||||
* ms/reflog-show-is-default (2011-08-01) 1 commit
|
||||
(merged to 'next' on 2011-08-03 at ae9cf6f)
|
||||
|
|
@ -60,79 +59,103 @@ Getting there; I have a couple of trivial fix-ups queued there, though.
|
|||
(merged to 'next' on 2011-08-03 at faeff94)
|
||||
+ pull: remove extra space from reflog message
|
||||
|
||||
* rs/grep-function-context (2011-08-01) 2 commits
|
||||
- grep: long context options
|
||||
- grep: add option to show whole function as context
|
||||
* tc/minix (2011-07-20) 1 commit
|
||||
(merged to 'next' on 2011-07-25 at 36ad29f)
|
||||
+ Makefile: add Minix configuration options.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/maint-combined-diff-work-tree (2011-08-04) 1 commit
|
||||
(merged to 'next' on 2011-08-05 at 976a4d4)
|
||||
+ diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
|
||||
|
||||
Will merge to "master" after cooking for a bit more.
|
||||
|
||||
* jk/fast-export-quote-path (2011-08-05) 1 commit
|
||||
(merged to 'next' on 2011-08-05 at a80e5f5)
|
||||
+ fast-export: quote paths in output
|
||||
|
||||
Will merge to "master".
|
||||
|
||||
* js/sh-style (2011-08-05) 2 commits
|
||||
- filter-branch.sh: de-dent usage string
|
||||
- misc-sh: fix up whitespace in some other .sh files.
|
||||
|
||||
Will merge to "next".
|
||||
|
||||
* cb/partial-commit-relative-pathspec (2011-08-02) 1 commit
|
||||
(merged to 'next' on 2011-08-03 at 6918f69)
|
||||
+ commit: allow partial commits with relative paths
|
||||
* ma/am-exclude (2011-08-03) 1 commit
|
||||
(merged to 'next' on 2011-08-05 at 658e57c)
|
||||
+ am: pass exclude down to apply
|
||||
|
||||
* mh/check-attr-relative (2011-08-02) 7 commits
|
||||
- fixup! builtin/check-attr.c and test-path-utils.c
|
||||
- test-path-utils: Add subcommand "prefix_path"
|
||||
- test-path-utils: Add subcommand "absolute_path"
|
||||
- git-check-attr: Normalize paths
|
||||
- git-check-attr: Demonstrate problems with relative paths
|
||||
- git-check-attr: Demonstrate problems with unnormalized paths
|
||||
- git-check-attr: test that no output is written to stderr
|
||||
(this branch uses mh/check-attr-listing.)
|
||||
Will merge to "master" after cooking for a bit more.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
* po/cygwin-backslash (2011-08-05) 2 commits
|
||||
- On Cygwin support both UNIX and DOS style path-names
|
||||
- git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
|
||||
|
||||
* 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.)
|
||||
I think a further refactoring (no, not my suggestion) was offered?
|
||||
|
||||
* jc/streaming-filter (2011-07-22) 1 commit
|
||||
(merged to 'next' on 2011-07-22 at 2081cd7)
|
||||
+ streaming: free git_istream upon closing
|
||||
* rc/maint-http-wrong-free (2011-08-03) 2 commits
|
||||
(merged to 'next' on 2011-08-05 at cea08ed)
|
||||
+ Makefile: some changes for http-related flag documentation
|
||||
+ http.c: fix an invalid free()
|
||||
|
||||
A large leak found and plugged.
|
||||
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
|
||||
* db/am-skip-blank-at-the-beginning (2011-08-08) 2 commits
|
||||
- RE: [PATCH v2] am: ignore leading whitespace before patch
|
||||
- am: ignore leading whitespace before patch
|
||||
|
||||
* 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.)
|
||||
Hmmm, perhaps mailinfo should consider [Rr][Ee]: instead of [Rr]e:
|
||||
as a known noise?
|
||||
|
||||
* 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
|
||||
Will merge to "next" after squashing them into one.
|
||||
|
||||
* jc/maint-smart-http-race-upload-pack (2011-08-08) 1 commit
|
||||
- helping smart-http/stateless-rpc fetch race
|
||||
|
||||
Will merge to "next".
|
||||
|
||||
* jn/maint-test-return (2011-08-08) 2 commits
|
||||
- test: cope better with use of return for errors
|
||||
- test: simplify return value of test_run_
|
||||
|
||||
Will merge to "next".
|
||||
|
||||
* rt/zlib-smaller-window (2011-08-08) 3 commits
|
||||
- test: consolidate definition of $LF
|
||||
- fixup! Tolerate zlib deflation with window
|
||||
- Tolerate zlib deflation with window size < 32Kb
|
||||
|
||||
Will merge to "next" after squashing the second one into the bottom one.
|
||||
|
||||
* fg/submodule-git-file-git-dir (2011-08-08) 3 commits
|
||||
- Move git-dir for submodules
|
||||
- fixup! rev-parse: add option --is-well-formed-git-dir
|
||||
- rev-parse: add option --is-well-formed-git-dir <path>
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* 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.
|
||||
|
||||
* cb/maint-ls-files-error-report (2011-08-01) 2 commits
|
||||
- squash! ls-files: fix pathspec display on error
|
||||
- ls-files: fix pathspec display on error
|
||||
|
||||
Will merge to "next" after getting an Ack for the fix-up and squashing it.
|
||||
|
||||
* ac/describe-dirty-refresh (2011-08-01) 2 commits
|
||||
- fixup! describe: Refresh the index when run with --dirty
|
||||
- describe: Refresh the index when run with --dirty
|
||||
|
||||
Will merge to "next" after squashing the fixup into the bottom one.
|
||||
|
||||
* nk/branch-v-abbrev (2011-07-01) 1 commit
|
||||
- branch -v: honor core.abbrev
|
||||
|
||||
|
|
@ -177,163 +200,7 @@ Cf. $gmane/176254, 176255, 166256
|
|||
The initial "tag --contains" de-pessimization without need for generation
|
||||
numbers is already in; backburnered.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* cb/maint-exec-error-report (2011-08-01) 2 commits
|
||||
- notice error exit from pager
|
||||
- error_routine: use parent's stderr if exec fails
|
||||
|
||||
* cb/maint-quiet-push (2011-07-31) 1 commit
|
||||
(merged to 'next' on 2011-08-01 at 87df938)
|
||||
+ propagate --quiet to send-pack/receive-pack
|
||||
|
||||
* jl/submodule-update-quiet (2011-07-28) 1 commit
|
||||
(merged to 'next' on 2011-08-01 at c611587)
|
||||
+ submodule: update and add must honor --quiet flag
|
||||
|
||||
* jn/gitweb-config-list-case (2011-07-31) 1 commit
|
||||
(merged to 'next' on 2011-08-01 at 9268738)
|
||||
+ gitweb: Git config keys are case insensitive, make config search too
|
||||
|
||||
* jn/gitweb-system-config (2011-07-24) 1 commit
|
||||
(merged to 'next' on 2011-08-01 at 4941e45)
|
||||
+ gitweb: Introduce common system-wide settings for convenience
|
||||
|
||||
* js/ls-tree-error (2011-07-25) 2 commits
|
||||
(merged to 'next' on 2011-08-01 at 61bae55)
|
||||
+ 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
|
||||
(merged to 'next' on 2011-08-01 at 6c88837)
|
||||
+ reset: give better reflog messages
|
||||
|
||||
* 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-08-02) 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)
|
||||
(this branch is used by mh/check-attr-relative.)
|
||||
|
||||
Except for a few nits, this seems mostly ready.
|
||||
|
||||
* jc/diff-index-refactor (2011-07-13) 2 commits
|
||||
(merged to 'next' on 2011-08-01 at 98d8b08)
|
||||
+ diff-lib: refactor run_diff_index() and do_diff_cache()
|
||||
+ diff-lib: simplify do_diff_cache()
|
||||
|
||||
* 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
|
||||
|
||||
* jk/http-auth-keyring (2011-08-03) 13 commits
|
||||
(merged to 'next' on 2011-08-03 at b06e80e)
|
||||
+ 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
|
||||
+ 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.
|
||||
|
||||
* 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-08-03) 13 commits
|
||||
- fixup! xdiff/xhistogram: rework handling of recursed results
|
||||
- xdiff/xhistogram: drop need for additional variable
|
||||
- xdiff/xhistogram: rely on xdl_trim_ends()
|
||||
- xdiff/xhistogram: rework handling of recursed results
|
||||
- xdiff: do away with xdl_mmfile_next()
|
||||
(merged to 'next' on 2011-08-03 at f9e2328)
|
||||
+ Make test number unique
|
||||
(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-08-01) 18 commits
|
||||
- revert: Propagate errors upwards from do_pick_commit
|
||||
- revert: Introduce --continue to continue the operation
|
||||
- revert: Don't implicitly 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: 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
|
||||
|
||||
Rerolled (v5) and looked reasonably clean.
|
||||
Will merge to "next".
|
||||
|
||||
* en/merge-recursive (2011-07-14) 50 commits
|
||||
- fixup! Do not assume that qsort is stable
|
||||
* en/merge-recursive (2011-08-04) 49 commits
|
||||
- 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
|
||||
|
|
@ -384,6 +251,177 @@ Will merge to "next".
|
|||
- t6042: Add failing testcase for rename/modify/add-source conflict
|
||||
- t6042: Add a testcase where git deletes an untracked file
|
||||
|
||||
The tip one should be squashed somewhere. I wanted to push this out in
|
||||
'next' today, but this seems to regress a rather trivial renaming merge,
|
||||
so I had to rewind and rebuild 'next' before pushing it out.
|
||||
Re-roll being worked on.
|
||||
|
||||
* 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
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* ef/ipv4-connect-error-report (2011-08-01) 2 commits
|
||||
(merged to 'next' on 2011-08-03 at ea4842b)
|
||||
+ connect: only log if all attempts failed (ipv4)
|
||||
+ Merge branch 'maint' into ef/ipv4-connect-error-report
|
||||
|
||||
Will merge to "master".
|
||||
|
||||
* js/bisect-no-checkout (2011-08-05) 10 commits
|
||||
- bisect: further style nitpicks
|
||||
- bisect: replace "; then" with "\n<tab>*then"
|
||||
- bisect: cleanup whitespace errors in git-bisect.sh.
|
||||
- bisect: add documentation for --no-checkout option.
|
||||
- bisect: add tests for the --no-checkout option.
|
||||
- bisect: introduce --no-checkout support into porcelain.
|
||||
- bisect: introduce support for --no-checkout option.
|
||||
- bisect: add tests to document expected behaviour in presence of broken trees.
|
||||
- bisect: use && to connect statements that are deferred with eval.
|
||||
- bisect: move argument parsing before state modification.
|
||||
|
||||
Will merge to "next".
|
||||
|
||||
* rs/grep-function-context (2011-08-01) 2 commits
|
||||
(merged to 'next' on 2011-08-05 at 8d63a8c)
|
||||
+ grep: long context options
|
||||
+ grep: add option to show whole function as context
|
||||
|
||||
Will merge to "master".
|
||||
|
||||
* cb/partial-commit-relative-pathspec (2011-08-02) 1 commit
|
||||
(merged to 'next' on 2011-08-03 at 6918f69)
|
||||
+ commit: allow partial commits with relative paths
|
||||
|
||||
Ideally the pathspec-prefix helper should be renamed to something more
|
||||
sensible, but we could live with it for now.
|
||||
|
||||
* cb/maint-exec-error-report (2011-08-01) 2 commits
|
||||
(merged to 'next' on 2011-08-05 at 2764424)
|
||||
+ notice error exit from pager
|
||||
+ error_routine: use parent's stderr if exec fails
|
||||
|
||||
Will merge to "master" after cooking for a bit more.
|
||||
|
||||
* cb/maint-quiet-push (2011-08-08) 2 commits
|
||||
(merged to 'next' on 2011-08-08 at 917d73b)
|
||||
+ receive-pack: do not overstep command line argument array
|
||||
(merged to 'next' on 2011-08-01 at 87df938)
|
||||
+ propagate --quiet to send-pack/receive-pack
|
||||
|
||||
Will merge to "master" after cooking for a bit more.
|
||||
|
||||
* 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
|
||||
|
||||
Will merge to "next".
|
||||
|
||||
* mh/check-attr-listing (2011-08-04) 23 commits
|
||||
- Rename git_checkattr() to git_check_attr()
|
||||
- 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
|
||||
- Remove redundant check
|
||||
- Remove redundant call to bootstrap_attr_stack()
|
||||
- Extract a function collect_all_attrs()
|
||||
- Teach prepare_attr_stack() to figure out dirlen itself
|
||||
- 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)
|
||||
(this branch is used by mh/check-attr-relative.)
|
||||
|
||||
Will merge to "next".
|
||||
|
||||
* mh/check-attr-relative (2011-08-04) 6 commits
|
||||
- test-path-utils: Add subcommand "prefix_path"
|
||||
- test-path-utils: Add subcommand "absolute_path"
|
||||
- git-check-attr: Normalize paths
|
||||
- git-check-attr: Demonstrate problems with relative paths
|
||||
- git-check-attr: Demonstrate problems with unnormalized paths
|
||||
- git-check-attr: test that no output is written to stderr
|
||||
(this branch uses mh/check-attr-listing.)
|
||||
|
||||
Will merge to "next".
|
||||
|
||||
* jk/http-auth-keyring (2011-08-03) 13 commits
|
||||
(merged to 'next' on 2011-08-03 at b06e80e)
|
||||
+ 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
|
||||
+ 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.
|
||||
|
||||
* 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-08-08) 12 commits
|
||||
- xdiff/xhistogram: drop need for additional variable
|
||||
- xdiff/xhistogram: rely on xdl_trim_ends()
|
||||
- xdiff/xhistogram: rework handling of recursed results
|
||||
- xdiff: do away with xdl_mmfile_next()
|
||||
(merged to 'next' on 2011-08-03 at f9e2328)
|
||||
+ Make test number unique
|
||||
(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()
|
||||
|
||||
Will merge to "next".
|
||||
|
||||
* rr/revert-cherry-pick-continue (2011-08-08) 18 commits
|
||||
- revert: Propagate errors upwards from do_pick_commit
|
||||
- revert: Introduce --continue to continue the operation
|
||||
- revert: Don't implicitly 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: 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
|
||||
|
||||
Getting into a reasonable shape. Is another round of re-roll coming?
|
||||
|
|
|
|||
Loading…
Reference in New Issue