To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Jan 2013, #04; Wed, 9)
-X-master-at: 44fe83502edf5391bb3a5997cab01794b4568062
-X-next-at: ffbe6f75280588398438a571a8a937328d87c3a3
+Subject: What's cooking in git.git (Jan 2013, #05; Fri, 11)
+X-master-at: a27d83aee906a767ae12dc39cd0aa5b42448bd6c
+X-next-at: b8b30b1c3494e2bbefedcefe98fd2bab94927a80
-What's cooking in git.git (Jan 2013, #04; Wed, 9)
+What's cooking in git.git (Jan 2013, #05; Fri, 11)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
-So far, about 60 topics, most of which have been cooking since the
-previous cycle, have been graduated to the 'master' branch in
-preparation for the next release, which tentatively is called 1.8.2.
-Many of these early topics are bugfixes and expected to later land
-in the 'maint' branch for 1.8.1.1 release as well.
-
As usual, this cycle is expected to last for 8 to 10 weeks, with a
preview -rc0 sometime in the middle of next month.
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
-[New Topics]
-
-* nz/send-email-headers-are-case-insensitive (2013-01-06) 1 commit
- - git-send-email: treat field names as case-insensitively
-
- When user spells "cc:" in lowercase in the fake "header" in the
- trailer part, send-email failed to pick up the addresses from
- there. As e-mail headers field names are case insensitive, this
- script should follow suit and treat "cc:" and "Cc:" the same way.
-
- Will merge to 'next'.
-
-
-* mk/complete-tcsh (2013-01-07) 1 commit
- - Prevent space after directories in tcsh completion
-
- Update tcsh command line completion so that an unwanted space is
- not added to a single directory name.
-
- Will merge to 'next'.
-
-
-* dg/subtree-fixes (2013-01-08) 7 commits
- - contrib/subtree: mkdir the manual directory if needed
- - contrib/subtree: honor $(DESTDIR)
- - contrib/subtree: fix synopsis and command help
- - contrib/subtree: better error handling for "add"
- - contrib/subtree: add --unannotate option
- - contrib/subtree: use %B for split Subject/Body
- - t7900: remove test number comments
-
- contrib/subtree updates.
-
- Will merge to 'next'.
-
-
-* ap/log-mailmap (2013-01-08) 11 commits
- - log --use-mailmap: optimize for cases without --author/--committer search
- - log: add log.mailmap configuration option
- - log: grep author/committer using mailmap
- - test: add test for --use-mailmap option
- - log: add --use-mailmap option
- - pretty: use mailmap to display username and email
- - mailmap: add mailmap structure to rev_info and pp
- - mailmap: simplify map_user() interface
- - mailmap: remove email copy and length limitation
- - Use split_ident_line to parse author and committer
- - string-list: allow case-insensitive string list
+[Graduated to "master"]
- Teach commands in the "log" family to optionally pay attention to
- the mailmap.
+* as/api-allocation-doc (2013-01-06) 1 commit
+ (merged to 'next' on 2013-01-08 at c80b544)
+ + api-allocation-growing.txt: encourage better variable naming
- Will merge to 'next'.
+* as/dir-c-cleanup (2012-12-28) 10 commits
+ (merged to 'next' on 2013-01-08 at 5aee090)
+ + dir.c: rename free_excludes() to clear_exclude_list()
+ + 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
+ + api-directory-listing.txt: update to match code
+ (this branch is used by as/check-ignore.)
-* nd/upload-pack-shallow-must-be-commit (2013-01-08) 1 commit
- - upload-pack: only accept commits from "shallow" line
+ Refactor and generally clean up the directory traversal API
+ implementation.
- A minor consistency check patch that does not have much relevance
- to the real world.
- Will merge to 'next'.
+* aw/rebase-am-failure-detection (2012-10-11) 1 commit
+ (merged to 'next' on 2013-01-07 at 9e2ee43)
+ + rebase: Handle cases where format-patch fails
---------------------------------------------------
-[Graduated to "master"]
+ Originally merged to 'next' on 2013-01-02
-* ap/merge-stop-at-prepare-commit-msg-failure (2013-01-03) 1 commit
- (merged to 'next' on 2013-01-07 at 6790566)
- + merge: Honor prepare-commit-msg return code
+ Save output from format-patch command in a temporary file, just in
+ case it aborts, to give a better failure-case behaviour.
- Originally merged to 'next' on 2013-01-04
- "git merge" started calling prepare-commit-msg hook like "git
- commit" does some time ago, but forgot to pay attention to the exit
- status of the hook. t7505 may want a general clean-up but that is
- a different topic.
+* jc/comment-cygwin-win32api-in-makefile (2013-01-06) 1 commit
+ (merged to 'next' on 2013-01-08 at dea04e8)
+ + Makefile: add comment on CYGWIN_V15_WIN32API
-* as/test-name-alias-uniquely (2012-12-28) 1 commit
- (merged to 'next' on 2013-01-07 at 3b11c25)
- + Use longer alias names in subdirectory tests
+* jc/maint-fmt-merge-msg-no-edit-lose-credit (2012-12-28) 1 commit
+ (merged to 'next' on 2013-01-07 at 497bf10)
+ + merge --no-edit: do not credit people involved in the side branch
Originally merged to 'next' on 2013-01-02
- A few short-and-bland aliases used in the tests were interfering
- with git-custom command in user's $PATH.
-
+ Stop spending cycles to compute information to be placed on
+ commented lines in "merge --no-edit".
-* cc/no-gitk-build-dependency (2012-12-18) 3 commits
- + Makefile: replace "echo 1>..." with "echo >..."
- + Makefile: detect when PYTHON_PATH changes
- + Makefile: remove tracking of TCLTK_PATH
- Remove leftover bits from an earlier change to move gitk in its own
- subdirectory. Reimplementing the dependency tracking rules needs
- to be done in gitk history separately.
+* jk/config-uname (2013-01-03) 1 commit
+ (merged to 'next' on 2013-01-08 at f986500)
+ + Makefile: hoist uname autodetection to config.mak.uname
+ Move the bits to set fallback default based on the platform from
+ the main Makefile to a separate file, so that it can be included in
+ Makefiles in subdirectories.
-* er/python-version-requirements (2012-12-28) 1 commit
- (merged to 'next' on 2013-01-07 at 4954e27)
- + Add checks to Python scripts for version dependencies.
- Originally merged to 'next' on 2013-01-02
+* jl/interrupt-clone-remove-separate-git-dir (2013-01-05) 1 commit
+ (merged to 'next' on 2013-01-08 at 568f874)
+ + clone: support atomic operation with --separate-git-dir
- Some python scripts we ship cannot be run with old versions of the
- interpreter.
+ When "git clone --separate-git-dir" is interrupted, we failed to
+ remove the real location we created the repository.
-* er/stop-recommending-parsecvs (2012-12-28) 1 commit
- (merged to 'next' on 2013-01-07 at 689f28f)
- + Remove the suggestion to use parsecvs, which is currently broken.
+* mz/pick-unborn (2012-12-23) 2 commits
+ (merged to 'next' on 2013-01-07 at c6c062b)
+ + learn to pick/revert into unborn branch
+ + tests: move test_cmp_rev to test-lib-functions
Originally merged to 'next' on 2013-01-02
- Stop recommending a defunct third-party software.
-
-
-* fc/remote-bzr (2013-01-02) 9 commits
- (merged to 'next' on 2013-01-07 at f8c0b76)
- + remote-bzr: detect local repositories
- + remote-bzr: add support for older versions of bzr
- + remote-bzr: add support to push special modes
- + remote-bzr: add support for fecthing special modes
- + remote-bzr: add simple tests
- + remote-bzr: update working tree upon pushing
- + remote-bzr: add support for remote repositories
- + remote-bzr: add support for pushing
- + Add new remote-bzr transport helper
-
- Originally merged to 'next' on 2013-01-04
-
- New remote helper for bzr, with minimum fix squashed in.
+ Allows "git cherry-pick $commit" when you do not have any history
+ behind HEAD yet.
-* jc/apply-trailing-blank-removal (2012-10-12) 1 commit
- + apply.c:update_pre_post_images(): the preimage can be truncated
+* nd/wildmatch (2013-01-01) 18 commits
+ (merged to 'next' on 2013-01-07 at 2a39f7d)
+ + wildmatch: replace variable 'special' with better named ones
+ + compat/fnmatch: respect NO_FNMATCH* even on glibc
+ + wildmatch: fix "**" special case
+ + t3070: Disable some failing fnmatch tests
+ + test-wildmatch: avoid Windows path mangling
+ + Support "**" wildcard in .gitignore and .gitattributes
+ + wildmatch: make /**/ match zero or more directories
+ + wildmatch: adjust "**" behavior
+ + wildmatch: fix case-insensitive matching
+ + wildmatch: remove static variable force_lower_case
+ + wildmatch: make wildmatch's return value compatible with fnmatch
+ + t3070: disable unreliable fnmatch tests
+ + Integrate wildmatch to git
+ + wildmatch: follow Git's coding convention
+ + wildmatch: remove unnecessary functions
+ + Import wildmatch from rsync
+ + ctype: support iscntrl, ispunct, isxdigit and isprint
+ + ctype: make sane_ctype[] const array
+ (this branch is used by nd/retire-fnmatch.)
- Fix to update_pre_post_images() that did not take into account the
- possibility that whitespace fix could shrink the preimage and
- change the number of lines in it.
+ Originally merged to 'next' on 2013-01-01
+ Allows pathname patterns in .gitignore and .gitattributes files
+ with double-asterisks "foo/**/bar" to match any number of directory
+ hierarchies.
-* jc/submittingpatches (2013-01-02) 4 commits
- (merged to 'next' on 2013-01-07 at 1cc3b8e)
- + SubmittingPatches: give list and maintainer addresses
- + SubmittingPatches: remove overlong checklist
- + SubmittingPatches: mention subsystems with dedicated repositories
- + SubmittingPatches: who am I and who cares?
- Originally merged to 'next' on 2013-01-04
+* rs/leave-base-name-in-name-field-of-tar (2013-01-05) 1 commit
+ (merged to 'next' on 2013-01-08 at 98f325e)
+ + archive-tar: split long paths more carefully
- Streamline the document and update with a few e-mail addresses the
- patches should be sent to.
+ Improve compatibility with implementations of "tar" that do not
+ like empty name field in header (with the additional prefix field
+ holding everything).
-* jk/enable-test-lint-by-default (2013-01-03) 1 commit
- (merged to 'next' on 2013-01-07 at 2a77155)
- + tests: turn on test-lint by default
+* tb/test-shell-lint (2013-01-02) 1 commit
+ (merged to 'next' on 2013-01-07 at 0bca54a)
+ + test: Add check-non-portable-shell.pl
Originally merged to 'next' on 2013-01-04
- We had two simple and quick tests to catch common mistakes when
- writing test scripts, but they weren't run by default when running
- tests.
-
-
-* jk/maint-fast-import-doc-dedup-done (2013-01-07) 1 commit
- (merged to 'next' on 2013-01-07 at af6a054)
- + git-fast-import(1): remove duplicate '--done' option
-
- The "logical order" reorganization can come after that is done and
- can cook longer in 'next'.
-
-
-* jk/pathspec-literal (2013-01-06) 1 commit
- (merged to 'next' on 2013-01-07 at f0725cc)
- + t6130-pathspec-noglob: Windows does not allow a file named "f*"
+ Check for common mistakes in the test scripts, based on simple
+ pattern-matching.
- Finishing touches to unbreak a test on Windows.
+--------------------------------------------------
+[New Topics]
+* jk/maint-fast-import-doc-reorder (2013-01-09) 2 commits
+ (merged to 'next' on 2013-01-10 at 9f3950d)
+ + git-fast-import(1): reorganise options
+ + git-fast-import(1): combine documentation of --[no-]relative-marks
-* jn/less-reconfigure (2013-01-02) 1 commit
- (merged to 'next' on 2013-01-07 at 04c11cb)
- + build: do not automatically reconfigure unless configure.ac changed
+ Will merge to 'master'.
- Originally merged to 'next' on 2013-01-02
- When autoconf is used, any build on a different commit always ran
- "config.status --recheck" even when unnecessary.
+* jk/shortlog-no-wrap-doc (2013-01-09) 1 commit
+ (merged to 'next' on 2013-01-10 at c79898a)
+ + git-shortlog(1): document behaviour of zero-width wrap
+ Will merge to 'master'.
-* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits
- + config: exit on error accessing any config file
- + doc: advertise GIT_CONFIG_NOSYSTEM
- + config: treat user and xdg config permission problems as errors
- + config, gitignore: failure to access with ENOTDIR is ok
- Deal with a situation where .config/git is a file and we notice
- .config/git/config is not readable due to ENOTDIR, not ENOENT.
+* rt/commit-cleanup-config (2013-01-10) 1 commit
+ - commit: make default of "cleanup" option configurable
+ Add a configuration variable to set default clean-up mode other
+ than "strip".
-* kb/maint-bundle-doc (2013-01-01) 2 commits
- (merged to 'next' on 2013-01-07 at 3d2b1ea)
- + Documentation: full-ness of a bundle is significant for cloning
- + Documentation: correct example restore from bundle
+ Will merge to 'next'.
- Originally merged to 'next' on 2013-01-04
- Update an example in the "git bundle" documentation.
+* jc/custom-comment-char (2013-01-10) 1 commit
+ - Allow custom "comment char"
+ An illustration to show codepaths that need to be touched to change
+ the hint lines in the edited text to begin with something other
+ than '#'.
-* mz/oneway-merge-wo-u-no-lstat (2012-12-20) 1 commit
- + oneway_merge(): only lstat() when told to update worktree
- Optimize "read-tree -m <tree-ish>" without "-u".
+* jn/maint-trim-vim-contrib (2013-01-10) 1 commit
+ - contrib/vim: simplify instructions for old vim support
+ Will merge to 'next'.
-* nd/maint-branch-desc-doc (2013-01-03) 5 commits
- (merged to 'next' on 2013-01-07 at 5117679)
- + format-patch: pick up branch description when no ref is specified
- + format-patch: pick up correct branch name from symbolic ref
- + t4014: a few more tests on cover letter using branch description
- + branch: delete branch description if it's empty
- + config.txt: a few lines about branch.<name>.description
- Originally merged to 'next' on 2013-01-04
-
- Teach various forms of "format-patch" command line to identify what
- branch the patches are taken from, so that the branch description
- is picked up in more cases.
+* mz/reset-misc (2013-01-10) 22 commits
+ - reset [--mixed]: use diff-based reset whether or not pathspec was given
+ - [SQUASH???] script portability fixes
+ - reset: allow reset on unborn branch
+ - reset $sha1 $pathspec: require $sha1 only to be treeish
+ - reset [--mixed] --quiet: don't refresh index
+ - reset.c: finish entire cmd_reset() whether or not pathspec is given
+ - reset [--mixed]: don't write index file twice
+ - reset.c: move lock, write and commit out of update_index_refresh()
+ - reset.c: move update_index_refresh() call out of read_from_tree()
+ - reset: avoid redundant error message
+ - reset --keep: only write index file once
+ - reset.c: replace switch by if-else
+ - reset.c: share call to die_if_unmerged_cache()
+ - [SQUASH???] style fixes
+ - reset.c: extract function for updating {ORIG,}HEAD
+ - reset.c: remove unnecessary variable 'i'
+ - [SQUASH???] style fix
+ - reset.c: extract function for parsing arguments
+ - reset: don't allow "git reset -- $pathspec" in bare repo
+ - reset.c: pass pathspec around instead of (prefix, argv) pair
+ - reset $pathspec: exit with code 0 if successful
+ - reset $pathspec: no need to discard index
+
+ Various 'reset' optimizations and clean-ups, followed by a change
+ to allow "git reset" to work even on an unborn branch.
+
+
+* pe/doc-email-env-is-trumped-by-config (2013-01-10) 1 commit
+ - git-commit-tree(1): correct description of defaults
+
+ In the precedence order, the environment variable $EMAIL comes
+ between the built-in default (i.e. taking value by asking the
+ system's gethostname() etc.) and the user.email configuration
+ variable; the documentation implied that it is stronger than the
+ configuration like $GIT_COMMITTER_EMAIL is, which is wrong.
+ Will merge to 'next'.
-* os/gitweb-highlight-uncaptured (2013-01-01) 1 commit
- (merged to 'next' on 2013-01-07 at 5db0558)
- + gitweb: fix error in sanitize when highlight is enabled
- Originally merged to 'next' on 2013-01-04
+* ds/completion-silence-in-tree-path-probe (2013-01-11) 1 commit
+ - git-completion.bash: silence "not a valid object" errors
- The code to sanitize control characters before passing it to
- "highlight" filter lost known-to-be-safe control characters by
- mistake.
+ An internal ls-tree call made by completion code only to probe if
+ a path exists in the tree recorded in a commit object leaked error
+ messages when the path is not there. It is not an error at all and
+ should not be shown to the end user.
+ Will merge to 'next'.
-* ta/remove-stale-translated-tut (2012-12-27) 1 commit
- (merged to 'next' on 2013-01-07 at 47b1056)
- + Remove Documentation/pt_BR/gittutorial.txt
- Originally merged to 'next' on 2013-01-02
+* er/replace-cvsimport (2013-01-11) 4 commits
+ - t9604: fixup for new cvsimport
+ - t9600: fixup for new cvsimport
+ - t/lib-cvs.sh: allow cvsps version 3.x.
+ - cvsimport: rewrite to use cvsps 3.x to fix major bugs
- Remove a translation of a document that was left stale.
+ Rewrite of cvsimport to talk with cvsps 3.x; this negatively
+ affects existing users of cvsimport that only have cvsps 2.x and
+ use -o, -M and -m options (they cannot use the old cvsimport with
+ old cvsps 2.x in the fall-back mode, even though these options are
+ supported by the old one), but it is not known how common they are.
+ For people who work with complex CVS histories that needs cvsps 3.x
+ to import correctly, this version should be a definite improvement,
+ so I would love to see small wrinkles in the new implementation
+ straightened out. Help from people with Python experience would be
+ appreciated in reviewing and patching.
-* tb/test-t9020-no-which (2013-01-01) 1 commit
- (merged to 'next' on 2013-01-07 at 9661948)
- + t9020: which is not portable
- Originally merged to 'next' on 2013-01-04
+* nd/fetch-depth-is-broken (2013-01-11) 3 commits
+ - fetch: elaborate --depth action
+ - upload-pack: fix off-by-one depth calculation in shallow clone
+ - fetch: add --unshallow for turning shallow repo into complete one
- Test portability update.
+ "git fetch --depth" was broken in at least three ways. The
+ resulting history was deeper than specified by one commit, it was
+ unclear how to wipe the shallowness of the repository with the
+ command, and documentation was misleading.
+ Will merge to 'next'.
-* tb/test-t9810-no-sed-i (2013-01-01) 1 commit
- (merged to 'next' on 2013-01-07 at cd82266)
- + t9810: Do not use sed -i
- Originally merged to 'next' on 2013-01-04
+* jc/no-git-config-in-clone (2013-01-11) 1 commit
+ - clone: do not export and unexport GIT_CONFIG
- Test portability update.
+ We stopped paying attention to $GIT_CONFIG environment that points
+ at a single configuration file from any command other than "git config"
+ quite a while ago, but "git clone" internally set, exported, and
+ then unexported the variable during its operation unnecessarily.
--------------------------------------------------
[Stalled]
--------------------------------------------------
[Cooking]
-* jc/blame-no-follow (2012-09-21) 2 commits
- - blame: pay attention to --no-follow
- - diff: accept --no-follow option
+* nz/send-email-headers-are-case-insensitive (2013-01-06) 1 commit
+ (merged to 'next' on 2013-01-10 at cf4c9c9)
+ + git-send-email: treat field names as case-insensitively
- Teaches "--no-follow" option to "git blame" to disable its
- whole-file rename detection.
+ When user spells "cc:" in lowercase in the fake "header" in the
+ trailer part, send-email failed to pick up the addresses from
+ there. As e-mail headers field names are case insensitive, this
+ script should follow suit and treat "cc:" and "Cc:" the same way.
+
+
+* mk/complete-tcsh (2013-01-07) 1 commit
+ (merged to 'next' on 2013-01-11 at b8b30b1)
+ + Prevent space after directories in tcsh completion
+
+ Update tcsh command line completion so that an unwanted space is
+ not added to a single directory name.
+
+
+* dg/subtree-fixes (2013-01-08) 7 commits
+ - contrib/subtree: mkdir the manual directory if needed
+ - contrib/subtree: honor $(DESTDIR)
+ - contrib/subtree: fix synopsis and command help
+ - contrib/subtree: better error handling for "add"
+ - contrib/subtree: add --unannotate option
+ - contrib/subtree: use %B for split Subject/Body
+ - t7900: remove test number comments
+
+ contrib/subtree updates.
Will merge to 'next'.
-* as/dir-c-cleanup (2012-12-28) 10 commits
- (merged to 'next' on 2013-01-08 at 5aee090)
- + dir.c: rename free_excludes() to clear_exclude_list()
- + 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
- + api-directory-listing.txt: update to match code
- (this branch is used by as/check-ignore.)
+* ap/log-mailmap (2013-01-10) 11 commits
+ (merged to 'next' on 2013-01-10 at 8544084)
+ + log --use-mailmap: optimize for cases without --author/--committer search
+ + log: add log.mailmap configuration option
+ + log: grep author/committer using mailmap
+ + test: add test for --use-mailmap option
+ + log: add --use-mailmap option
+ + pretty: use mailmap to display username and email
+ + mailmap: add mailmap structure to rev_info and pp
+ + mailmap: simplify map_user() interface
+ + mailmap: remove email copy and length limitation
+ + Use split_ident_line to parse author and committer
+ + string-list: allow case-insensitive string list
- Refactor and generally clean up the directory traversal API
- implementation.
+ Teach commands in the "log" family to optionally pay attention to
+ the mailmap.
- Will merge to 'master'.
+* nd/upload-pack-shallow-must-be-commit (2013-01-08) 1 commit
+ (merged to 'next' on 2013-01-10 at a8b3ba5)
+ + upload-pack: only accept commits from "shallow" line
-* jk/config-uname (2013-01-03) 1 commit
- (merged to 'next' on 2013-01-08 at f986500)
- + Makefile: hoist uname autodetection to config.mak.uname
+ A minor consistency check patch that does not have much relevance
+ to the real world.
- Move the bits to set fallback default based on the platform from
- the main Makefile to a separate file, so that it can be included in
- Makefiles in subdirectories.
- Will merge to 'master'.
+* jc/blame-no-follow (2012-09-21) 2 commits
+ (merged to 'next' on 2013-01-10 at 201c7f4)
+ + blame: pay attention to --no-follow
+ + diff: accept --no-follow option
+
+ Teaches "--no-follow" option to "git blame" to disable its
+ whole-file rename detection.
* jc/push-2.0-default-to-simple (2013-01-08) 11 commits
Will merge to 'master'.
-* jl/interrupt-clone-remove-separate-git-dir (2013-01-05) 1 commit
- (merged to 'next' on 2013-01-08 at 568f874)
- + clone: support atomic operation with --separate-git-dir
-
- When "git clone --separate-git-dir" is interrupted, we failed to
- remove the real location we created the repository.
-
- Will merge to 'master'.
-
-
-* rs/leave-base-name-in-name-field-of-tar (2013-01-05) 1 commit
- (merged to 'next' on 2013-01-08 at 98f325e)
- + archive-tar: split long paths more carefully
-
- Improve compatibility with implementations of "tar" that do not
- like empty name field in header (with the additional prefix field
- holding everything).
-
- Will merge to 'master'.
-
-
-* as/api-allocation-doc (2013-01-06) 1 commit
- (merged to 'next' on 2013-01-08 at c80b544)
- + api-allocation-growing.txt: encourage better variable naming
-
- Will merge to 'master'.
-
-
-* jc/comment-cygwin-win32api-in-makefile (2013-01-06) 1 commit
- (merged to 'next' on 2013-01-08 at dea04e8)
- + Makefile: add comment on CYGWIN_V15_WIN32API
-
- Will merge to 'master'.
-
-
* jn/xml-depends-on-asciidoc-conf (2013-01-06) 1 commit
(merged to 'next' on 2013-01-08 at 4faf8d4)
+ docs: manpage XML depends on asciidoc.conf
Will merge to 'master'.
-* nd/clone-no-separate-git-dir-with-bare (2013-01-06) 1 commit
+* nd/clone-no-separate-git-dir-with-bare (2013-01-10) 1 commit
- clone: forbid --bare --separate-git-dir <dir>
- Expecting a reroll.
- $gmane/212863
+ Will merge to 'next'.
-* nd/parse-pathspec (2013-01-06) 21 commits
+* nd/parse-pathspec (2013-01-11) 20 commits
- Convert more init_pathspec() to parse_pathspec()
- Convert add_files_to_cache to take struct pathspec
- Convert {read,fill}_directory to take struct pathspec
- commit: convert to use parse_pathspec
- clean: convert to use parse_pathspec
- Export parse_pathspec() and convert some get_pathspec() calls
- - pathspec: make sure the prefix part is wildcard-clean
- Add parse_pathspec() that converts cmdline args to struct pathspec
- pathspec: save the non-wildcard length part
Unfortunately, this conflicts a couple of topics in flight. I tried
to be careful while resolving conflicts, though.
- Expecting a reroll after the dust settles.
-
* rs/zip-tests (2013-01-07) 4 commits
(merged to 'next' on 2013-01-08 at 8e37423)
Will merge to 'master'.
-* tb/test-shell-lint (2013-01-02) 1 commit
- (merged to 'next' on 2013-01-07 at 0bca54a)
- + test: Add check-non-portable-shell.pl
-
- Originally merged to 'next' on 2013-01-04
-
- Check for common mistakes in the test scripts, based on simple
- pattern-matching.
-
- Will merge to 'master'.
-
-
* jc/doc-maintainer (2013-01-03) 2 commits
- - howto/maintain: mark titles for asciidoc
- - Documentation: update "howto maintain git"
+ (merged to 'next' on 2013-01-11 at f35d582)
+ + howto/maintain: mark titles for asciidoc
+ + Documentation: update "howto maintain git"
Describe tools for automation that were invented since this
document was originally written.
- Will merge to 'next'.
-
* fc/remote-testgit-feature-done (2012-10-29) 1 commit
- - remote-testgit: properly check for errors
+ (merged to 'next' on 2013-01-10 at 3132a60)
+ + remote-testgit: properly check for errors
In the longer term, tightening rules is a good thing to do, and
because nobody who has worked in the remote helper area seems to be
such a retroactive tightening will affect their remote helpers. So
let's advance this topic to see what happens.
- Will merge to 'next'.
-
* mo/cvs-server-updates (2012-12-09) 18 commits
(merged to 'next' on 2013-01-08 at 75e2d11)
Will cook in 'next' for a while to see if anybody screams.
-* aw/rebase-am-failure-detection (2012-10-11) 1 commit
- (merged to 'next' on 2013-01-07 at 9e2ee43)
- + rebase: Handle cases where format-patch fails
-
- Originally merged to 'next' on 2013-01-02
-
- Save output from format-patch command in a temporary file, just in
- case it aborts, to give a better failure-case behaviour.
-
- Will merge to 'master'.
-
-
* ap/status-ignored-in-ignored-directory (2013-01-07) 3 commits
- - status: always report ignored tracked directories
+ (merged to 'next' on 2013-01-10 at 20f7476)
+ + status: always report ignored tracked directories
(merged to 'next' on 2013-01-07 at 2a20b19)
+ git-status: Test --ignored behavior
+ dir.c: Make git-status --ignored more consistent
- Originally merged to 'next' on 2013-01-04
-
Output from "git status --ignored" showed an unexpected interaction
with "--untracked".
- Will merge to 'next'.
-
-
-* jc/maint-fmt-merge-msg-no-edit-lose-credit (2012-12-28) 1 commit
- (merged to 'next' on 2013-01-07 at 497bf10)
- + merge --no-edit: do not credit people involved in the side branch
-
- Originally merged to 'next' on 2013-01-02
-
- Stop spending cycles to compute information to be placed on
- commented lines in "merge --no-edit".
-
- Will merge to 'master'.
-
-* as/check-ignore (2013-01-06) 11 commits
+* as/check-ignore (2013-01-10) 12 commits
+ - t0008: avoid brace expansion
- add git-check-ignore sub-command
- setup.c: document get_pathspec()
- add.c: extract new die_if_path_beyond_symlink() for reuse
- dir.c: provide clear_directory() for reclaiming dir_struct memory
- dir.c: keep track of where patterns came from
- dir.c: use a single struct exclude_list per source of excludes
- (this branch uses as/dir-c-cleanup.)
- The test it adds seems to break under dash.
- Expecting a reroll or fixup.
+ Add a new command "git check-ignore" for debugging .gitignore
+ files.
+
+ Will merge to 'next'.
* jc/format-patch-reroll (2013-01-03) 9 commits
Will merge to 'master'.
-* mz/pick-unborn (2012-12-23) 2 commits
- (merged to 'next' on 2013-01-07 at c6c062b)
- + learn to pick/revert into unborn branch
- + tests: move test_cmp_rev to test-lib-functions
-
- Originally merged to 'next' on 2013-01-02
-
- Allows "git cherry-pick $commit" when you do not have any history
- behind HEAD yet.
-
- Will merge to 'master'.
-
-
* nd/retire-fnmatch (2013-01-01) 7 commits
(merged to 'next' on 2013-01-07 at ab31f9b)
+ Makefile: add USE_WILDMATCH to use wildmatch as fnmatch
+ wildmatch: support "no FNM_PATHNAME" mode
+ wildmatch: make dowild() take arbitrary flags
+ wildmatch: rename constants and update prototype
- (this branch uses nd/wildmatch.)
Originally merged to 'next' on 2013-01-04
$gmane/211935
-* zk/clean-report-failure (2013-01-06) 1 commit
+* zk/clean-report-failure (2013-01-10) 2 commits
+ - [SQUASH???] style fixes
- git-clean: Display more accurate delete messages
"git clean" states what it is going to remove and then goes on to
removed after recursing into a directory, which makes the output
confusing and even wrong.
- Expecting a response to $gmane/212860.
+ Will merge to 'next' after squashing the style fix in.
-* mp/complete-paths (2012-12-21) 1 commit
+* mp/complete-paths (2013-01-11) 1 commit
- git-completion.bash: add support for path completion
The completion script used to let the default completer to suggest
would not want to add an unmodified path). Teach it to use a more
git-aware logic to enumerate only relevant ones.
- It has been reported (no surprise) that this does not work inside
- subdirectory, and fixing it seems to be non-trivial. $gmane/212642
-
- Waiting for area-experts' help.
+ Waiting for area-experts' help and review.
* bc/append-signed-off-by (2013-01-01) 12 commits
Expecting a reroll.
$gmane/212507
-
-
-* nd/wildmatch (2013-01-01) 18 commits
- (merged to 'next' on 2013-01-07 at 2a39f7d)
- + wildmatch: replace variable 'special' with better named ones
- + compat/fnmatch: respect NO_FNMATCH* even on glibc
- + wildmatch: fix "**" special case
- + t3070: Disable some failing fnmatch tests
- + test-wildmatch: avoid Windows path mangling
- + Support "**" wildcard in .gitignore and .gitattributes
- + wildmatch: make /**/ match zero or more directories
- + wildmatch: adjust "**" behavior
- + wildmatch: fix case-insensitive matching
- + wildmatch: remove static variable force_lower_case
- + wildmatch: make wildmatch's return value compatible with fnmatch
- + t3070: disable unreliable fnmatch tests
- + Integrate wildmatch to git
- + wildmatch: follow Git's coding convention
- + wildmatch: remove unnecessary functions
- + Import wildmatch from rsync
- + ctype: support iscntrl, ispunct, isxdigit and isprint
- + ctype: make sane_ctype[] const array
- (this branch is used by nd/retire-fnmatch.)
-
- Originally merged to 'next' on 2013-01-01
-
- Allows pathname patterns in .gitignore and .gitattributes files
- with double-asterisks "foo/**/bar" to match any number of directory
- hierarchies.
-
- Will merge to 'master'.
projects / thirdparty / git.git / commitdiff
