mirror of
https://github.com/git/git.git
synced 2026-08-11 01:27:52 +00:00
What's cooking (2012/09 #07)
This commit is contained in:
Junio C Hamano
@@ -1,22 +1,19 @@
|
||||
To: git@vger.kernel.org
|
||||
Bcc: lwn@lwn.net
|
||||
Subject: What's cooking in git.git (Sep 2012, #06; Mon, 17)
|
||||
X-master-at: 5976753e732186d7f8a5c6af55a8ce3e2d2b677b
|
||||
X-next-at: 3c10a18fa86d85c603e54c9c31776661e9d9fa29
|
||||
Subject: What's cooking in git.git (Sep 2012, #07; Fri, 21)
|
||||
X-master-at: 16eed7c9938a65022010c3d95ada911b2fd46d25
|
||||
X-next-at: 68bd821eac8800bddb2213d2b7e4065e3e082059
|
||||
|
||||
What's cooking in git.git (Sep 2012, #06; Mon, 17)
|
||||
What's cooking in git.git (Sep 2012, #07; Fri, 21)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with
|
||||
'-' are only in 'pu' (proposed updates) while commits prefixed with
|
||||
'+' are in 'next'.
|
||||
|
||||
The seventh wave of topics are in 'master' now.
|
||||
|
||||
The archive-zip topic really needs help by people on platforms where
|
||||
zip archive is an important part of life (in other words, not UNIX)
|
||||
to test, in order to make sure the archive generated out of a tree
|
||||
with non-ascii filenames are usable on their platforms.
|
||||
Today's tip of 'pu' has breakage in t0007 for people whose shell is
|
||||
not bash; a topic queued there needs to be fixed before moving
|
||||
forward.
|
||||
|
||||
I'm planning to keep this cycle reasonably short and aim for tagging
|
||||
the result as 1.8.0 at the end of 9th week, on October 21st, after
|
||||
@@ -31,147 +28,38 @@ repositories listed at
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* cn/branch-set-upstream-to (2012-09-11) 2 commits
|
||||
(merged to 'next' on 2012-09-12 at e162318)
|
||||
+ completion: complete branch name for "branch --set-upstream-to="
|
||||
+ completion: add --set-upstream-to and --unset-upstream
|
||||
* er/doc-fast-import-done (2012-08-22) 1 commit
|
||||
(merged to 'next' on 2012-09-17 at bb8709a)
|
||||
+ fast-import: document the --done option
|
||||
|
||||
Finishing touches to the recently graduated topic to introduce
|
||||
"git branch --set-upstream-to" option.
|
||||
I got tired of waiting for ESR to respond with S-o-b for a trivial
|
||||
documentation updates, so I'll be moving this forward.
|
||||
|
||||
|
||||
* dg/run-command-child-cleanup (2012-09-11) 1 commit
|
||||
(merged to 'next' on 2012-09-12 at aa5f9e2)
|
||||
+ run-command.c: fix broken list iteration in clear_child_for_cleanup
|
||||
* jc/maint-log-grep-all-match (2012-09-15) 10 commits
|
||||
(merged to 'next' on 2012-09-17 at 3c10a18)
|
||||
+ t7810-grep: test --all-match with multiple --grep and --author options
|
||||
+ t7810-grep: test interaction of multiple --grep and --author options
|
||||
+ t7810-grep: test multiple --author with --all-match
|
||||
+ t7810-grep: test multiple --grep with and without --all-match
|
||||
+ t7810-grep: bring log --grep tests in common form
|
||||
(merged to 'next' on 2012-09-15 at 73fad40)
|
||||
+ grep.c: mark private file-scope symbols as static
|
||||
(merged to 'next' on 2012-09-14 at 86b848c)
|
||||
+ log: document use of multiple commit limiting options
|
||||
+ log --grep/--author: honor --all-match honored for multiple --grep patterns
|
||||
+ grep: show --debug output only once
|
||||
+ grep: teach --debug option to dump the parse tree
|
||||
|
||||
The code to wait for subprocess and remove it from our internal queue
|
||||
wasn't quite right.
|
||||
Fix a long-standing bug in "git log --grep" when multiple "--grep"
|
||||
are used together with "--all-match" and "--author" or "--committer".
|
||||
|
||||
|
||||
* jc/ll-merge-binary-ours (2012-09-12) 3 commits
|
||||
(merged to 'next' on 2012-09-12 at 9a7a6b3)
|
||||
+ ll-merge: warn about inability to merge binary files only when we can't
|
||||
+ attr: "binary" attribute should choose built-in "binary" merge driver
|
||||
+ merge: teach -Xours/-Xtheirs to binary ll-merge driver
|
||||
* jc/maint-log-grep-all-match-1 (2012-09-20) 1 commit
|
||||
(merged to 'next' on 2012-09-20 at 6bf192f)
|
||||
+ grep.c: make two symbols really file-scope static this time
|
||||
|
||||
"git merge -Xtheirs" did not help content-level merge of binary
|
||||
files; it should just take their version. Also "*.jpg binary" in
|
||||
the attributes did not imply they should use the binary ll-merge
|
||||
driver.
|
||||
|
||||
|
||||
* jc/mailinfo-RE (2012-09-09) 1 commit
|
||||
(merged to 'next' on 2012-09-12 at 131edbf)
|
||||
+ mailinfo: strip "RE: " prefix
|
||||
|
||||
We strip the prefix from "Re: subject" and also from a less common
|
||||
"re: subject", but left even less common "RE: subject" intact.
|
||||
|
||||
|
||||
* jc/maint-blame-no-such-path (2012-09-11) 2 commits
|
||||
(merged to 'next' on 2012-09-14 at 84064d5)
|
||||
+ blame: allow "blame file" in the middle of a conflicted merge
|
||||
+ blame $path: avoid getting fooled by case insensitive filesystems
|
||||
|
||||
"git blame MAKEFILE" run in a history that has "Makefile" but not
|
||||
"MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
|
||||
confused on a case insensitive filesystem and failed to do so.
|
||||
|
||||
Even during a conflicted merge, "git blame $path" always meant to
|
||||
blame uncommitted changes to the "working tree" version; make it
|
||||
more useful by showing cleanly merged parts as coming from the other
|
||||
branch that is being merged.
|
||||
|
||||
|
||||
* jk/config-warn-on-inaccessible-paths (2012-09-13) 1 commit
|
||||
(merged to 'next' on 2012-09-14 at a9bba78)
|
||||
+ attr: failure to open a .gitattributes file is OK with ENOTDIR
|
||||
|
||||
The attribute system may be asked for a path whose leading
|
||||
directories do not exist in the current working tree. In addition
|
||||
to ENOENT, ENOTDIR must be ignored.
|
||||
|
||||
|
||||
* jw/doc-commit-title (2012-09-13) 1 commit
|
||||
(merged to 'next' on 2012-09-14 at d6bdd97)
|
||||
+ Documentation: describe subject more precisely
|
||||
|
||||
Update parts of document that talked about "first line of commit
|
||||
log" to say "title of commit" with definition of what that "title"
|
||||
is.
|
||||
|
||||
|
||||
* mh/fetch-filter-refs (2012-09-15) 15 commits
|
||||
(merged to 'next' on 2012-09-15 at 8767db3)
|
||||
+ test-string-list.c: Fix some sparse warnings
|
||||
(merged to 'next' on 2012-09-14 at 567afe4)
|
||||
+ fetch-pack: eliminate spurious error messages
|
||||
+ cmd_fetch_pack(): simplify computation of return value
|
||||
+ fetch-pack: report missing refs even if no existing refs were received
|
||||
+ cmd_fetch_pack(): return early if finish_connect() fails
|
||||
+ filter_refs(): simplify logic
|
||||
+ filter_refs(): build refs list as we go
|
||||
+ filter_refs(): delete matched refs from sought list
|
||||
+ fetch_pack(): update sought->nr to reflect number of unique entries
|
||||
+ filter_refs(): do not check the same sought_pos twice
|
||||
+ Change fetch_pack() and friends to take string_list arguments
|
||||
+ fetch_pack(): reindent function decl and defn
|
||||
+ Rename static function fetch_pack() to http_fetch_pack()
|
||||
+ t5500: add tests of fetch-pack --all --depth=N $URL $REF
|
||||
+ t5500: add tests of error output for missing refs
|
||||
(this branch uses mh/string-list.)
|
||||
|
||||
Code simplification and clarification.
|
||||
|
||||
|
||||
* mh/string-list (2012-09-12) 6 commits
|
||||
(merged to 'next' on 2012-09-14 at b4c50bc)
|
||||
+ api-string-list.txt: initialize the string_list the easy way
|
||||
+ string_list: add a function string_list_longest_prefix()
|
||||
+ string_list: add a new function, string_list_remove_duplicates()
|
||||
+ string_list: add a new function, filter_string_list()
|
||||
+ string_list: add two new functions for splitting strings
|
||||
+ string_list: add function string_list_append_nodup()
|
||||
(this branch is used by mh/fetch-filter-refs.)
|
||||
|
||||
|
||||
* nd/maint-diffstat-summary (2012-09-14) 1 commit
|
||||
(merged to 'next' on 2012-09-14 at 994217d)
|
||||
+ Revert diffstat back to English
|
||||
|
||||
Earlier we made the diffstat summary line that shows the number of
|
||||
lines added/deleted localizable, but it was found irritating having
|
||||
to see them in various languages on a list whose discussion language
|
||||
is English.
|
||||
|
||||
The original had trivial thinko in reverting Q_(), which has been
|
||||
fixed.
|
||||
|
||||
|
||||
* sl/autoconf (2012-09-11) 2 commits
|
||||
(merged to 'next' on 2012-09-12 at 6ebe199)
|
||||
+ build: don't duplicate substitution of make variables
|
||||
+ build: improve GIT_CONF_SUBST signature
|
||||
|
||||
Reduces repetition in configure.ac.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* rt/maint-clone-single (2012-09-16) 2 commits
|
||||
- fixup! check what we really care about in a more direct way
|
||||
- clone --single: limit the fetch refspec to fetched branch
|
||||
|
||||
Running "git fetch" in a repository made with "git clone --single"
|
||||
slurps all the branches, defeating the point of "--single".
|
||||
|
||||
|
||||
* ep/malloc-check-perturb (2012-09-14) 2 commits
|
||||
- MALLOC_CHECK: various clean-ups
|
||||
- Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption
|
||||
|
||||
Queued with fix-ups.
|
||||
Waiting for response from the author.
|
||||
A finishing touch to the "log --all-match --grep" topic.
|
||||
|
||||
|
||||
* jc/make-static (2012-09-15) 14 commits
|
||||
@@ -195,37 +83,186 @@ repositories listed at
|
||||
global namespace contamination.
|
||||
|
||||
|
||||
* aj/xfuncname-ada (2012-09-16) 1 commit
|
||||
- Add userdiff patterns for Ada
|
||||
* mh/fetch-filter-refs (2012-09-18) 1 commit
|
||||
(merged to 'next' on 2012-09-18 at 5dd77d8)
|
||||
+ string_list API: document what "sorted" means
|
||||
|
||||
|
||||
* aw/rebase-i-edit-todo (2012-09-16) 3 commits
|
||||
- rebase -i: Add tests for "--edit-todo"
|
||||
- rebase -i: Teach "--edit-todo" action
|
||||
- rebase -i: Refactor help messages for todo file
|
||||
* mv/cherry-pick-s (2012-09-14) 1 commit
|
||||
(merged to 'next' on 2012-09-14 at 2d143e1)
|
||||
+ cherry-pick: don't forget -s on failure
|
||||
|
||||
After "git cherry-pick -s" gave control back to the user asking
|
||||
help to resolve conflicts, concluding "git commit" needs to be run
|
||||
with "-s" if the user wants to sign it off, but people often forgot
|
||||
to do so.
|
||||
|
||||
|
||||
* jc/maint-mailinfo-mime-attr (2012-09-17) 1 commit
|
||||
- mailinfo: do not concatenate charset= attribute values from mime headers
|
||||
* nd/fetch-status-alignment (2012-09-14) 1 commit
|
||||
(merged to 'next' on 2012-09-14 at 34237db)
|
||||
+ fetch: align per-ref summary report in UTF-8 locales
|
||||
|
||||
The status report from "git fetch", when messages like 'up-to-date'
|
||||
are translated, did not align the branch names well.
|
||||
|
||||
|
||||
* js/poll-emu (2012-09-17) 4 commits
|
||||
- make poll() work on platforms that can't recv() on a non-socket
|
||||
- poll() exits too early with EFAULT if 1st arg is NULL
|
||||
- fix some win32 specific dependencies in poll.c
|
||||
- make poll available for other platforms lacking it
|
||||
* pw/p4-submit-conflicts (2012-09-16) 12 commits
|
||||
(merged to 'next' on 2012-09-17 at 7e57551)
|
||||
+ git-p4: add submit --conflict option and config varaiable
|
||||
+ git p4: add submit --prepare-p4-only option
|
||||
+ git p4: add submit --dry-run option
|
||||
+ git p4: accept -v for --verbose
|
||||
+ git p4: revert deleted files after submit cancel
|
||||
+ git p4: rearrange submit template construction
|
||||
+ git p4: test clean-up after failed submit, fix added files
|
||||
+ git p4: standardize submit cancel due to unchanged template
|
||||
+ git p4: move conflict prompt into run, add [q]uit input
|
||||
+ git p4: remove submit failure options [a]pply and [w]rite
|
||||
+ git p4: gracefully fail if some commits could not be applied
|
||||
+ git p4 test: remove bash-ism of combined export/assignment
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* js/rebase-exec-command-not-found (2012-09-18) 1 commit
|
||||
- rebase -i: fix misleading error message after 'exec no-such' instruction
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* nd/wildmatch (2012-09-17) 5 commits
|
||||
- Support "**" in .gitignore and .gitattributes patterns using wildmatch()
|
||||
- Integrate wildmatch to git
|
||||
- compat/wildmatch: fix case-insensitive matching
|
||||
- compat/wildmatch: remove static variable force_lower_case
|
||||
- Import wildmatch from rsync
|
||||
* rr/test-make-sure-we-have-git (2012-09-18) 1 commit
|
||||
- t/test-lib: make sure Git has already been built
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* as/test-tweaks (2012-09-20) 7 commits
|
||||
- tests: paint unexpectedly fixed known breakages in bold red
|
||||
- tests: test the test framework more thoroughly
|
||||
- [SQUASH] t/t0000-basic.sh: quoting of TEST_DIRECTORY is screwed up
|
||||
- tests: refactor mechanics of testing in a sub test-lib
|
||||
- tests: paint skipped tests in bold blue
|
||||
- tests: test number comes first in 'not ok $count - $message'
|
||||
- tests: paint known breakages in bold yellow
|
||||
|
||||
Various minor tweaks to the test framework to paint its output
|
||||
lines in colors that match what they mean better.
|
||||
|
||||
Has the "is this really blue?" issue Peff raised resolved???
|
||||
|
||||
|
||||
* db/doc-custom-xmlto (2012-09-19) 1 commit
|
||||
- Documentation/Makefile: Allow custom XMLTO binary
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* js/hp-nonstop (2012-09-19) 1 commit
|
||||
- Port to HP NonStop
|
||||
(this branch uses js/poll-emu.)
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* po/maint-docs (2012-09-19) 5 commits
|
||||
- Doc branch: show -vv option and alternative
|
||||
- Doc clean: add See Also link
|
||||
- Doc add: link gitignore
|
||||
- Doc: separate gitignore pattern sources
|
||||
- Doc: shallow clone deepens _to_ new depth
|
||||
|
||||
Various documentation fixups.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* sp/maint-http-info-refs-no-retry (2012-09-20) 1 commit
|
||||
- Revert "retry request without query when info/refs?query fails"
|
||||
(this branch is used by jk/smart-http-switch.)
|
||||
|
||||
Kills an old workaround for a unlikely server misconfiguration that
|
||||
hurts debuggability.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jk/smart-http-switch (2012-09-21) 2 commits
|
||||
- remote-curl: let users turn off smart http
|
||||
- remote-curl: rename is_http variable
|
||||
(this branch uses sp/maint-http-info-refs-no-retry.)
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* sp/maint-http-enable-gzip (2012-09-20) 1 commit
|
||||
- Enable info/refs gzip decompression in HTTP client
|
||||
|
||||
Allows a more common 'gzip' Accept-Encoding to be used.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* nd/pretty-placeholder-with-color-option (2012-09-20) 4 commits
|
||||
- [SQUASH] do not use real-sb without initializing
|
||||
- pretty: support right alignment
|
||||
- pretty: support placeholders %C+ and %C-
|
||||
- pretty: share code between format_decoration and show_decorations
|
||||
|
||||
The feature might be great, but the interface is iffy.
|
||||
|
||||
|
||||
* jk/receive-pack-unpack-error-to-pusher (2012-09-21) 3 commits
|
||||
- receive-pack: drop "n/a" on unpacker errors
|
||||
- receive-pack: send pack-processing stderr over sideband
|
||||
- receive-pack: redirect unpack-objects stdout to /dev/null
|
||||
|
||||
Send errors from "unpack-objects" and "index-pack" back to the "git
|
||||
push" over the git and smart-http protocols, just like it is done
|
||||
for a push over the ssh protocol.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jc/blame-follows-renames (2012-09-21) 1 commit
|
||||
- git blame: document that it always follows origin across whole-file renames
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* fa/remote-svn (2012-09-19) 16 commits
|
||||
- Add a test script for remote-svn
|
||||
- remote-svn: add marks-file regeneration
|
||||
- Add a svnrdump-simulator replaying a dump file for testing
|
||||
- remote-svn: add incremental import
|
||||
- remote-svn: Activate import/export-marks for fast-import
|
||||
- Create a note for every imported commit containing svn metadata
|
||||
- vcs-svn: add fast_export_note to create notes
|
||||
- Allow reading svn dumps from files via file:// urls
|
||||
- remote-svn, vcs-svn: Enable fetching to private refs
|
||||
- When debug==1, start fast-import with "--stats" instead of "--quiet"
|
||||
- Add documentation for the 'bidi-import' capability of remote-helpers
|
||||
- Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
|
||||
- Add argv_array_detach and argv_array_free_detached
|
||||
- Add svndump_init_fd to allow reading dumps from arbitrary FDs
|
||||
- Add git-remote-testsvn to Makefile
|
||||
- Implement a remote helper for svn in C
|
||||
(this branch is used by fa/vcs-svn.)
|
||||
|
||||
A GSoC project. Looked promising.
|
||||
Waiting for comments from mentors and stakeholders.
|
||||
|
||||
|
||||
* fa/vcs-svn (2012-09-19) 4 commits
|
||||
- vcs-svn: remove repo_tree
|
||||
- vcs-svn/svndump: rewrite handle_node(), begin|end_revision()
|
||||
- vcs-svn/svndump: restructure node_ctx, rev_ctx handling
|
||||
- svndump: move struct definitions to .h
|
||||
(this branch uses fa/remote-svn.)
|
||||
|
||||
A GSoC project. Looked promising.
|
||||
Waiting for comments from mentors and stakeholders.
|
||||
|
||||
|
||||
* ph/credential-refactor (2012-09-02) 5 commits
|
||||
- wincred: port to generic credential helper
|
||||
- Merge branch 'ef/win32-cred-helper' into ph/credential-refactor
|
||||
@@ -245,21 +282,6 @@ repositories listed at
|
||||
Seems to have design regression for silent users.
|
||||
|
||||
|
||||
* as/check-ignore (2012-09-02) 10 commits
|
||||
. fixup: decl-after-stmt etc.
|
||||
. Add git-check-ignore
|
||||
. Provide free_directory() for reclaiming dir_struct memory
|
||||
. Extract some useful pathspec handling code from builtin/add.c into a library
|
||||
. For each exclude pattern, store information about where it came from
|
||||
. dir.c: refactor excluded() and path_excluded()
|
||||
. dir.c: refactor excluded_from_list()
|
||||
. dir.c: rename cryptic 'which' variable to more consistent name
|
||||
. Improve documentation and comments regarding directory traversal API
|
||||
. Update directory listing API doc to match code
|
||||
|
||||
Will be rerolled.
|
||||
|
||||
|
||||
* jx/test-real-path (2012-08-27) 1 commit
|
||||
- test: set the realpath of CWD as TRASH_DIRECTORY
|
||||
|
||||
@@ -391,6 +413,94 @@ repositories listed at
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* as/check-ignore (2012-09-21) 15 commits
|
||||
- [REROLL NEEDED] minimum compilation fix
|
||||
- Add git-check-ignore sub-command
|
||||
- dir.c: provide free_directory() for reclaiming dir_struct memory
|
||||
- pathspec.c: move reusable code from builtin/add.c
|
||||
- dir.c: refactor treat_gitlinks()
|
||||
- dir.c: keep track of where patterns came from
|
||||
- dir.c: refactor is_path_excluded()
|
||||
- dir.c: refactor is_excluded()
|
||||
- dir.c: refactor is_excluded_from_list()
|
||||
- dir.c: rename excluded() to is_excluded()
|
||||
- dir.c: rename excluded_from_list() to is_excluded_from_list()
|
||||
- dir.c: rename path_excluded() to is_path_excluded()
|
||||
- dir.c: rename cryptic 'which' variable to more consistent name
|
||||
- Improve documentation and comments regarding directory traversal API
|
||||
- Update directory listing API doc to match code
|
||||
|
||||
Rerolled.
|
||||
Expecting a further reroll to follow-up review comments.
|
||||
|
||||
|
||||
* rt/maint-clone-single (2012-09-20) 1 commit
|
||||
- clone --single: limit the fetch refspec to fetched branch
|
||||
|
||||
Running "git fetch" in a repository made with "git clone --single"
|
||||
slurps all the branches, defeating the point of "--single".
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* ep/malloc-check-perturb (2012-09-17) 2 commits
|
||||
- MALLOC_CHECK: various clean-ups
|
||||
- Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption
|
||||
|
||||
Run our test scripts with MALLOC_CHECK_ and MALLOC_PERTURB_, the
|
||||
built-in memory access checking facility GNU libc has.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* aj/xfuncname-ada (2012-09-16) 1 commit
|
||||
- Add userdiff patterns for Ada
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* aw/rebase-i-edit-todo (2012-09-19) 5 commits
|
||||
- rebase -i: suggest using --edit-todo to fix an unknown instruction
|
||||
- rebase -i: Add tests for "--edit-todo"
|
||||
- rebase -i: Teach "--edit-todo" action
|
||||
- rebase -i: Refactor help messages for todo file
|
||||
- rebase usage: subcommands can not be combined with -i
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jc/maint-mailinfo-mime-attr (2012-09-17) 1 commit
|
||||
- mailinfo: do not concatenate charset= attribute values from mime headers
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* js/poll-emu (2012-09-17) 4 commits
|
||||
- make poll() work on platforms that can't recv() on a non-socket
|
||||
- poll() exits too early with EFAULT if 1st arg is NULL
|
||||
- fix some win32 specific dependencies in poll.c
|
||||
- make poll available for other platforms lacking it
|
||||
(this branch is used by js/hp-nonstop.)
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* nd/wildmatch (2012-09-17) 5 commits
|
||||
- Support "**" in .gitignore and .gitattributes patterns using wildmatch()
|
||||
- Integrate wildmatch to git
|
||||
- compat/wildmatch: fix case-insensitive matching
|
||||
- compat/wildmatch: remove static variable force_lower_case
|
||||
- Import wildmatch from rsync
|
||||
|
||||
Allows pathname patterns in .gitignore and .gitattributes files
|
||||
with double-asterisks "foo/**/bar" to match any number of directory
|
||||
hiearchies.
|
||||
|
||||
It was pointed out that some symbols that do not have to be global
|
||||
are left global.
|
||||
Will wait for a reroll.
|
||||
|
||||
|
||||
* jc/maint-name-rev (2012-09-17) 7 commits
|
||||
- describe --contains: use "name-rev --algorithm=weight"
|
||||
- name-rev --algorithm=weight: tests and documentation
|
||||
@@ -413,75 +523,6 @@ repositories listed at
|
||||
notes-cache).
|
||||
|
||||
|
||||
* er/doc-fast-import-done (2012-08-22) 1 commit
|
||||
(merged to 'next' on 2012-09-17 at bb8709a)
|
||||
+ fast-import: document the --done option
|
||||
|
||||
I got tired of waiting for ESR to respond with S-o-b for a trivial
|
||||
documentation updates, so I'll be moving this forward.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* nd/fetch-status-alignment (2012-09-14) 1 commit
|
||||
(merged to 'next' on 2012-09-14 at 34237db)
|
||||
+ fetch: align per-ref summary report in UTF-8 locales
|
||||
|
||||
The status report from "git fetch", when messages like 'up-to-date'
|
||||
are translated, did not align the branch names well.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mv/cherry-pick-s (2012-09-14) 1 commit
|
||||
(merged to 'next' on 2012-09-14 at 2d143e1)
|
||||
+ cherry-pick: don't forget -s on failure
|
||||
|
||||
After "git cherry-pick -s" gave control back to the user asking
|
||||
help to resolve conflicts, concluding "git commit" needs to be run
|
||||
with "-s" if the user wants to sign it off, but people often forgot
|
||||
to do so.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/maint-log-grep-all-match (2012-09-15) 10 commits
|
||||
(merged to 'next' on 2012-09-17 at 3c10a18)
|
||||
+ t7810-grep: test --all-match with multiple --grep and --author options
|
||||
+ t7810-grep: test interaction of multiple --grep and --author options
|
||||
+ t7810-grep: test multiple --author with --all-match
|
||||
+ t7810-grep: test multiple --grep with and without --all-match
|
||||
+ t7810-grep: bring log --grep tests in common form
|
||||
(merged to 'next' on 2012-09-15 at 73fad40)
|
||||
+ grep.c: mark private file-scope symbols as static
|
||||
(merged to 'next' on 2012-09-14 at 86b848c)
|
||||
+ log: document use of multiple commit limiting options
|
||||
+ log --grep/--author: honor --all-match honored for multiple --grep patterns
|
||||
+ grep: show --debug output only once
|
||||
+ grep: teach --debug option to dump the parse tree
|
||||
|
||||
Fix a long-standing bug in "git log --grep" when multiple "--grep"
|
||||
are used together with "--all-match" and "--author" or "--committer".
|
||||
|
||||
|
||||
* pw/p4-submit-conflicts (2012-09-16) 12 commits
|
||||
(merged to 'next' on 2012-09-17 at 7e57551)
|
||||
+ git-p4: add submit --conflict option and config varaiable
|
||||
+ git p4: add submit --prepare-p4-only option
|
||||
+ git p4: add submit --dry-run option
|
||||
+ git p4: accept -v for --verbose
|
||||
+ git p4: revert deleted files after submit cancel
|
||||
+ git p4: rearrange submit template construction
|
||||
+ git p4: test clean-up after failed submit, fix added files
|
||||
+ git p4: standardize submit cancel due to unchanged template
|
||||
+ git p4: move conflict prompt into run, add [q]uit input
|
||||
+ git p4: remove submit failure options [a]pply and [w]rite
|
||||
+ git p4: gracefully fail if some commits could not be applied
|
||||
+ git p4 test: remove bash-ism of combined export/assignment
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/xprm-generation (2012-09-14) 1 commit
|
||||
- test-generation: compute generation numbers and clock skews
|
||||
|
||||
@@ -489,14 +530,15 @@ repositories listed at
|
||||
world projects.
|
||||
|
||||
|
||||
* rs/archive-zip-utf8 (2012-09-04) 1 commit
|
||||
* rs/archive-zip-utf8 (2012-09-18) 4 commits
|
||||
(merged to 'next' on 2012-09-18 at 8535c83)
|
||||
+ archive-zip: declare creator to be Unix for UTF-8 paths
|
||||
+ archive-zip: support UTF-8 paths
|
||||
+ Revert "archive-zip: support UTF-8 paths"
|
||||
(merged to 'next' on 2012-09-11 at 3b1f071)
|
||||
+ archive-zip: support UTF-8 paths
|
||||
|
||||
Need help from people on platforms on which Zip matters to see
|
||||
compatiblity with other people's zip implementations.
|
||||
|
||||
Will merge to 'master' as part of the sixth batch.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jl/submodule-rm (2012-08-27) 1 commit
|
||||
@@ -513,40 +555,6 @@ repositories listed at
|
||||
Replacement sent but was still iffy around conflicted merge cases.
|
||||
|
||||
|
||||
* fa/remote-svn (2012-08-28) 16 commits
|
||||
- Add a test script for remote-svn
|
||||
- remote-svn: add marks-file regeneration
|
||||
- Add a svnrdump-simulator replaying a dump file for testing
|
||||
- remote-svn: add incremental import
|
||||
- remote-svn: Activate import/export-marks for fast-import
|
||||
- Create a note for every imported commit containing svn metadata
|
||||
- vcs-svn: add fast_export_note to create notes
|
||||
- Allow reading svn dumps from files via file:// urls
|
||||
- remote-svn, vcs-svn: Enable fetching to private refs
|
||||
- When debug==1, start fast-import with "--stats" instead of "--quiet"
|
||||
- Add documentation for the 'bidi-import' capability of remote-helpers
|
||||
- Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
|
||||
- Add argv_array_detach and argv_array_free_detached
|
||||
- Add svndump_init_fd to allow reading dumps from arbitrary FDs
|
||||
- Add git-remote-testsvn to Makefile and .gitignore
|
||||
- Implement a remote helper for svn in C
|
||||
(this branch is used by fa/vcs-svn.)
|
||||
|
||||
A GSoC project. Looked promising.
|
||||
Waiting for comments from mentors and stakeholders.
|
||||
|
||||
|
||||
* fa/vcs-svn (2012-08-28) 4 commits
|
||||
- vcs-svn: remove repo_tree
|
||||
- vcs-svn/svndump: rewrite handle_node(), begin|end_revision()
|
||||
- vcs-svn/svndump: restructure node_ctx, rev_ctx handling
|
||||
- svndump: move struct definitions to .h
|
||||
(this branch uses fa/remote-svn.)
|
||||
|
||||
A GSoC project. Looked promising.
|
||||
Waiting for comments from mentors and stakeholders.
|
||||
|
||||
|
||||
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
|
||||
- pager: drop "wait for output to run less" hack
|
||||
|
||||
|
||||
Reference in New Issue
Block a user