From: Junio C Hamano Date: Mon, 24 Jan 2011 19:13:28 +0000 (-0800) Subject: What's cooking (2011/01 #05) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b612c9709129b9d548be42d1af8b3b9fd52b6944;p=thirdparty%2Fgit.git What's cooking (2011/01 #05) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index b912f8eb3b..9c2861b795 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,9 +1,9 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Jan 2011, #04; Tue, 18) -X-master-at: 60a2e3320f3030d7c1f453a8cadafad7012fd820 -X-next-at: f3988f86f5368178f7bfc023cb75c0f3524745ba +Subject: What's cooking in git.git (Jan 2011, #05; Mon, 24) +X-master-at: 630fc7878b6fd1bc188d4916b64f4df37658df96 +X-next-at: c56cfa5dde233fbc2a459f8acd7743bae3060ba7 -What's cooking in git.git (Jan 2011, #04; Tue, 18) +What's cooking in git.git (Jan 2011, #05; Mon, 24) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -15,61 +15,17 @@ now on. Hopefully lists will do the same and we can have a fairly short rc period this cycle. Please remind if there are patches that ought to be in 1.7.4 but are forgotten. --------------------------------------------------- -[New Topics] - -* jn/unpack-lstat-failure-report (2011-01-12) 2 commits - - unpack-trees: handle lstat failure for existing file - - unpack-trees: handle lstat failure for existing directory - -* rr/fi-import-marks-if-exists (2011-01-15) 1 commit - - fast-import: Introduce --import-marks-if-exists - -* tr/diff-words-test (2011-01-18) 4 commits - - t4034 (diff --word-diff): add a minimum Perl drier test vector - - t4034 (diff --word-diff): style suggestions - - userdiff: simplify word-diff safeguard - - t4034: bulk verify builtin word regex sanity - -------------------------------------------------- [Graduated to "master"] -* jk/diff-driver-binary-doc (2011-01-09) 1 commit - (merged to 'next' on 2011-01-10 at 1aa4c70) - + docs: explain diff.*.binary option - -* jn/gitweb-no-logo (2010-09-03) 1 commit - (merged to 'next' on 2011-01-04 at a5d186c) - + gitweb: make logo optional - -* jn/perl-funcname (2010-12-27) 2 commits - (merged to 'next' on 2011-01-05 at 20542ed) - + userdiff/perl: catch BEGIN/END/... and POD as headers - + diff: funcname and word patterns for perl - -* jn/t9010-work-around-broken-svnadmin (2011-01-06) 1 commit - (merged to 'next' on 2011-01-10 at bd2f619) - + t9010: svnadmin can fail even if available - -* rj/svn-test (2010-12-30) 1 commit - (merged to 'next' on 2011-01-05 at ff38429) - + lib-git-svn.sh: Move web-server handling code into separate function - -* rj/test-fixes (2010-12-14) 4 commits - (merged to 'next' on 2011-01-08 at 37ef456) - + t4135-*.sh: Skip the "backslash" tests on cygwin - + t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW - + t3032-*.sh: Pass the -b (--binary) option to sed on cygwin - + t6038-*.sh: Pass the -b (--binary) option to sed on cygwin - -* sr/gitweb-hilite-more (2010-12-30) 2 commits - (merged to 'next' on 2011-01-05 at 6b52e7e) - + gitweb: remove unnecessary test when closing file descriptor - + gitweb: add extensions to highlight feature map +* as/userdiff-pascal (2011-01-11) 1 commit + (merged to 'next' on 2011-01-18 at 9060389) + + userdiff: match Pascal class methods -* tr/submodule-relative-scp-url (2011-01-10) 1 commit - (merged to 'next' on 2011-01-10 at 895f887) - + submodule: fix relative url parsing for scp-style origin +* js/test-windows (2011-01-11) 2 commits + (merged to 'next' on 2011-01-11 at c8274ed) + + t/README: hint about using $(pwd) rather than $PWD in tests + + Fix expected values of setup tests on Windows -------------------------------------------------- [Stalled] @@ -115,17 +71,22 @@ to feature/minor fix requests. -------------------------------------------------- [Cooking] -* js/test-windows (2011-01-11) 2 commits - (merged to 'next' on 2011-01-11 at c8274ed) - + t/README: hint about using $(pwd) rather than $PWD in tests - + Fix expected values of setup tests on Windows +* jn/unpack-lstat-failure-report (2011-01-12) 2 commits + - unpack-trees: handle lstat failure for existing file + - unpack-trees: handle lstat failure for existing directory + +* rr/fi-import-marks-if-exists (2011-01-15) 1 commit + - fast-import: Introduce --import-marks-if-exists + +* tr/diff-words-test (2011-01-18) 4 commits + - t4034 (diff --word-diff): add a minimum Perl drier test vector + - t4034 (diff --word-diff): style suggestions + - userdiff: simplify word-diff safeguard + - t4034: bulk verify builtin word regex sanity * ab/p4 (2011-01-11) 1 commit - git-p4: correct indenting and formatting -* as/userdiff-pascal (2011-01-11) 1 commit - - userdiff: match Pascal class methods - * mz/rebase (2010-12-28) 31 commits - rebase -i: remove unnecessary state rebase-root - rebase -i: don't read unused variable preserve_merges @@ -159,10 +120,9 @@ to feature/minor fix requests. - rebase: refactor reading of state - rebase: clearer names for directory variables -I personally haven't finished reading this one yet; Thomas said the -general direction of the series basically seemed sound (with nits here -and there), which I trust. Hopefully we will see a re-roll of this -series sometime soon, but we are not in a hurry. +The general direction of the series basically seemed sound, with nits here +and there. Hopefully we will see a re-roll of this series sometime soon, +but we are not in a hurry. * ef/alias-via-run-command (2011-01-07) 1 commit (merged to 'next' on 2011-01-06 at 1fbd4a0) @@ -176,8 +136,6 @@ series sometime soon, but we are not in a hurry. (merged to 'next' on 2011-01-05 at 790b288) + setup: translate symlinks in filename when using absolute paths -Seems trivial but came a bit too late for the cycle. - * ae/better-template-failure-report (2010-12-18) 1 commit (merged to 'next' on 2011-01-05 at d3f9142) + Improve error messages when temporary file creation fails