From 9f15e7532cb4386cbda108e2f5dbc37bbfdc0717 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 20 Dec 2012 19:58:56 -0800 Subject: [PATCH] Meta/Make: update OpenBSD specific tweaks --- Make | 7 +- whats-cooking.txt | 248 ++++++++++++++++++++++++++++------------------ 2 files changed, 151 insertions(+), 104 deletions(-) diff --git a/Make b/Make index 9ea81abbab..1184ecdad9 100755 --- a/Make +++ b/Make @@ -59,11 +59,8 @@ done Wall='-Wall -Wdeclaration-after-statement' tests= jobs= skip= oldtest= case `uname` in OpenBSD) - NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL - skip="t9200 t9502" - SHELL_PATH=/usr/local/bin/bash; export SHELL_PATH - NO_PEDANTIC=CannotDo NO_JOBS=CannotDo - Wall= + O="-fgnu89-inline" + skip="t9402" ;; FreeBSD) OLD_ICONV=YesPlease; export OLD_ICONV diff --git a/whats-cooking.txt b/whats-cooking.txt index 0b120a6969..22a5aa98ac 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,22 +1,16 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Dec 2012, #05; Tue, 18) -X-master-at: b7cd0c9b692af7728a1d876a3e4fe760956e00c3 -X-next-at: c92fcd913d6db915141f6e28e838c7976a746786 +Subject: What's cooking in git.git (Dec 2012, #06; Wed, 19) +X-master-at: 18499ba694711c02a5bc729b7f8e362dd760b10a +X-next-at: 82c5000aef763fdc977dac25e6b06ac4de5787dd -What's cooking in git.git (Dec 2012, #05; Tue, 18) +What's cooking in git.git (Dec 2012, #06; Wed, 19) -------------------------------------------------- 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 tip of the 'master' branch is a bit past 1.8.1-rc2; hopefully we -can go final around the end of the week. - -Many topics are getting into good shape in 'next', hopefully ready -to be merged soon after the 1.8.1 final. - You can find the changes described here in the integration branches of the repositories listed at @@ -25,72 +19,45 @@ repositories listed at -------------------------------------------------- [New Topics] -* 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 +* jc/mkstemp-more-careful-error-reporting (2012-12-18) 1 commit + - xmkstemp(): avoid showing truncated template more carefully - 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. + An earlier patch to save original arguments to mkstemp() away and + use it to report what filename we failed to create incorrectly used + the buffer munged by failing mkstemp(). -* cr/doc-checkout-branch (2012-12-18) 2 commits - - Documentation/git-checkout.txt: document 70c9ac2 behavior - - Documentation/git-checkout.txt: clarify usage +* jc/maint-test-portability (2012-12-19) 3 commits + - t4014: fix arguments to grep + - t9502: do not assume GNU tar + - t0200: "locale" may not exist + (this branch is used by jc/test-portability.) - Document the magic "git checkout " hack to create - local branch out of a remote tracking branch that hasn't been - documented so far. + Minor test fixes noticed while running our tests on OpenBSD 5.2, + applicable to 'maint'. - Will merge to 'next'. +* jc/test-portability (2012-12-19) 3 commits + - t9020: use configured Python to run the test helper + - t3600: Avoid "cp -a", which is a GNUism + - Merge branch 'jc/maint-test-portability' into 'jc/test-portability' + (this branch uses jc/maint-test-portability.) -* jc/format-color-auto (2012-12-17) 2 commits - - log --format: teach %C(auto,black) to respect color config - - t6006: clean up whitespace + The remainder of jc/maint-test-portability, applicable to 'master'. - Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does - not color its output when writing to a non-terminal. - Will merge to 'next'. +* jc/maint-fnmatch-old-style-definition (2012-12-19) 1 commit + - compat/fnmatch: update old-style definition to ANSI + Update old-style function definition "int foo(bar) int bar; {}" + to "int foo(int bar) {}". -* ss/svn-prompt (2012-12-17) 3 commits - - git-svn, perl/Git.pm: extend and use Git->prompt method for querying users - - perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set - - git-svn, perl/Git.pm: add central method for prompting passwords - Waiting for an Ack from the area export. +* jk/pathspec-literal (2012-12-19) 1 commit + - add global --literal-pathspecs option - -* zk/clean-report-failure (2012-12-17) 1 commit - - git-clean: Display more accurate delete messages - - "git clean" states what it is going to remove and then goes on to - remove it, but sometimes it only discovers things that cannot be - removed after recursing into a directory, which makes the output - confusing and even wrong. - - Waiting for responses to review comments. - - -* jc/doc-diff-blobs (2012-12-18) 1 commit - - Documentation: Describe "git diff " separately - - "git diff " was not documented and was only hinted as - an extension to "git diff -- ", but - comparison between two blobs are more special than that. It does - not take any pathspec to begin with. - - -* mp/complete-paths (2012-12-18) 1 commit - - git-completion.bash: add support for path completion - - The completion script used to let the default completer to suggest - pathnames, which gave too many irrelevant choices (e.g. "git add" - would not want to add an unmodified path). Teach it to use a more - git-aware logic to enumerate only relevant ones. + Allow scripts to feed literal paths to commands that take + pathspecs, by disabling wildcard globbing. -------------------------------------------------- [Stalled] @@ -300,6 +267,86 @@ repositories listed at -------------------------------------------------- [Cooking] +* wk/submodule-update-remote (2012-12-19) 3 commits + - submodule add: If --branch is given, record it in .gitmodules + - submodule update: add --remote for submodule's upstream changes + - submodule: add get_submodule_config helper funtion + + The beginning of 'integrate with the tip of the remote branch, not + the commit recorded in the superproject gitlink' support. + + +* 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. + + +* cr/doc-checkout-branch (2012-12-18) 2 commits + (merged to 'next' on 2012-12-19 at e14b6c4) + + Documentation/git-checkout.txt: document 70c9ac2 behavior + + Documentation/git-checkout.txt: clarify usage + + Document the magic "git checkout " hack to create + local branch out of a remote tracking branch that hasn't been + documented so far. + + May want to fast-track to the upcoming release. + + +* jc/format-color-auto (2012-12-17) 2 commits + (merged to 'next' on 2012-12-18 at 5aaac94) + + log --format: teach %C(auto,black) to respect color config + + t6006: clean up whitespace + + Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does + not color its output when writing to a non-terminal. + + +* ss/svn-prompt (2012-12-17) 3 commits + - git-svn, perl/Git.pm: extend and use Git->prompt method for querying users + - perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set + - git-svn, perl/Git.pm: add central method for prompting passwords + + Waiting for an Ack from the area export. + + +* zk/clean-report-failure (2012-12-17) 1 commit + - git-clean: Display more accurate delete messages + + "git clean" states what it is going to remove and then goes on to + remove it, but sometimes it only discovers things that cannot be + removed after recursing into a directory, which makes the output + confusing and even wrong. + + Waiting for responses to review comments. + + +* jc/doc-diff-blobs (2012-12-18) 1 commit + (merged to 'next' on 2012-12-19 at 82c5000) + + Documentation: Describe "git diff " separately + + "git diff " was not documented and was only hinted as + an extension to "git diff -- ", but + comparison between two blobs are more special than that. It does + not take any pathspec to begin with. + + May want to fast-track to the upcoming release. + + +* mp/complete-paths (2012-12-19) 1 commit + - git-completion.bash: add support for path completion + + The completion script used to let the default completer to suggest + pathnames, which gave too many irrelevant choices (e.g. "git add" + would not want to add an unmodified path). Teach it to use a more + git-aware logic to enumerate only relevant ones. + + * ja/directory-attrs (2012-12-17) 1 commit (merged to 'next' on 2012-12-17 at ced8e73) + Add directory pattern matching to attributes @@ -321,6 +368,8 @@ repositories listed at Update various entries in our .mailmap file. + May want to fast-track to the upcoming release. + * jk/mailmap-from-blob (2012-12-13) 5 commits (merged to 'next' on 2012-12-17 at 14b7cdc) @@ -339,22 +388,26 @@ repositories listed at (merged to 'next' on 2012-12-17 at 7984924) + index-format.txt: clarify what is "invalid" + May want to fast-track to the upcoming release. + * as/doc-for-devs (2012-12-16) 2 commits - - Documentation: move support for old compilers to CodingGuidelines - - SubmittingPatches: add convention of prefixing commit messages + (merged to 'next' on 2012-12-18 at ff1f37e) + + Documentation: move support for old compilers to CodingGuidelines + + SubmittingPatches: add convention of prefixing commit messages It might be a better idea to move the text the bottom one adds to the extended description from the quick checklist part. - Will merge to 'next'. + May want to fast-track to the upcoming release. -* dm/port (2012-12-18) 4 commits +* dm/port (2012-12-19) 4 commits - git-compat-util.h: do not #include by default - Generalize the inclusion of strings.h - Detect when the passwd struct is missing pw_gecos - Support builds when sys/param.h is missing + (this branch is used by mk/qnx.) Will merge to 'next'. @@ -363,28 +416,29 @@ repositories listed at (merged to 'next' on 2012-12-17 at 857413a) + fetch --tags: clarify documentation - The explanation for "fetch --tags" was actually talking more about - "fetch --no-tags". Clariify what "--tags" really means. + "git fetch --tags" was explained as if it were "git fetch + --no-no-tags", which is not the case, causing confusion. + + May want to fast-track to the upcoming release. * jk/avoid-mailto-invalid-in-doc (2012-12-16) 1 commit - - Documentation: don't link to example mail addresses + (merged to 'next' on 2012-12-18 at 81dac40) + + Documentation: don't link to example mail addresses Avoids invalid sample e-mail addresses from becoming mailto links - in the formatted output, which by itself is "Meh" for me (who - cares?) but it highlights some issues with ``pretty quotes''. + in the formatted output. - Will merge to 'next'. + May want to fast-track to the upcoming release. * jk/complete-commit-c (2012-12-15) 1 commit - - completion: complete refs for "git commit -c" + (merged to 'next' on 2012-12-18 at 75b5f21) + + completion: complete refs for "git commit -c" Complete "git commmit -c foo" into a refname that begins with "foo". - Will merge to 'next'. - * jk/error-const-return (2012-12-15) 2 commits - silence some -Wuninitialized false positives @@ -392,18 +446,21 @@ repositories listed at Help compilers' flow analysis by making it more explicit that error() always returns -1, to reduce false "variable used - uninitialized" warnings. + uninitialized" warnings. Looks somewhat ugly but not too much. - This is still an RFC. + Will merge to 'next'. -* mk/qnx (2012-12-15) 2 commits +* mk/qnx (2012-12-19) 2 commits - Port to QNX - Make lock local to fetch_pack + (this branch uses dm/port.) Port to QNX; we may want to rebase this on top of dm/port topic as it also wants to use the HAVE_STRINGS_H mechanism it introduces. + Will merge to 'next'. + * rj/maint-cygwin-say-color (2012-12-15) 1 commit - tests: Allow customization of how say_color() prints @@ -414,19 +471,21 @@ repositories listed at * sl/readme-gplv2 (2012-12-15) 2 commits - - README: it does not matter who the current maintainer is - - README: Git is released under the GPLv2, not just "the GPL" + (merged to 'next' on 2012-12-18 at c839810) + + README: it does not matter who the current maintainer is + + README: Git is released under the GPLv2, not just "the GPL" Clarify that the project as a whole is GPLv2 only, with some parts borrowed under different licenses that are compatible with GPLv2. - Will merge to 'next'. + May want to fast-track to the upcoming release. * ta/api-index-doc (2012-12-16) 1 commit - - Remove misleading date from api-index-skel.txt + (merged to 'next' on 2012-12-18 at a251888) + + Remove misleading date from api-index-skel.txt - Will merge to 'next'. + May want to fast-track to the upcoming release. * as/test-tweaks (2012-12-17) 7 commits @@ -499,14 +558,6 @@ repositories listed at Will cook in 'next'. -* wk/submodule-update-remote (2012-12-12) 3 commits - - submodule add: If --branch is given, record it in .gitmodules - - submodule update: add --remote for submodule's upstream changes - - submodule: add get_submodule_config helper funtion - - Expecting a re-roll. - - * jc/maint-fbsd-sh-ifs-workaround (2012-12-10) 1 commit (merged to 'next' on 2012-12-11 at 6659fdc) + sh-setup: work around "unset IFS" bug in some shells @@ -523,16 +574,15 @@ repositories listed at * nd/invalidate-i-t-a-cache-tree (2012-12-15) 4 commits - - cache-tree: invalidate i-t-a paths after generating trees - - cache-tree: fix writing cache-tree when CE_REMOVE is present - - cache-tree: replace "for" loops in update_one with "while" loops - - cache-tree: remove dead i-t-a code in verify_cache() + (merged to 'next' on 2012-12-18 at 33e4488) + + cache-tree: invalidate i-t-a paths after generating trees + + cache-tree: fix writing cache-tree when CE_REMOVE is present + + cache-tree: replace "for" loops in update_one with "while" loops + + cache-tree: remove dead i-t-a code in verify_cache() Writing out a tree object when you still have intent-to-add entries in the index left an incorrect cache-tree data there. - Will merge to 'next'. - * jl/submodule-deinit (2012-12-04) 1 commit (merged to 'next' on 2012-12-07 at ea772f0) @@ -552,7 +602,7 @@ repositories listed at + git-svn: Recommend use of structure options. + git-svn: Document branches with at-sign(@). - Will cook in 'next'. + May want to fast-track to the upcoming release. * pf/editor-ignore-sigint (2012-12-02) 5 commits -- 2.47.3