From 69f640afba8f4f3f49da9b9be6fd6f50b4027b1e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 30 Jan 2013 10:32:18 -0800 Subject: [PATCH] What's cooking (2013/01 #11) --- whats-cooking.txt | 534 +++++++++++++++++++++++++++++------------------------- 1 file changed, 290 insertions(+), 244 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index c8b41c0883..e58fe0ea9f 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Jan 2013, #10; Sun, 27) -X-master-at: 50a6b54c03219ad74b9f3f839e0321be18daeaf6 -X-next-at: acf9419c4c1775dd98c80ac4ecc3b5dd89df9fb4 +Subject: What's cooking in git.git (Jan 2013, #11; Wed, 30) +X-master-at: 070c57df42ea4eadcc43d0456d114560124326c3 +X-next-at: 7d3a2ef96c8474fb18c8a5ca045cdbeb6180ac4f -What's cooking in git.git (Jan 2013, #10; Sun, 27) +What's cooking in git.git (Jan 2013, #11; Wed, 30) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -22,127 +22,138 @@ repositories listed at -------------------------------------------------- [New Topics] -* bc/git-p4-for-python-2.4 (2013-01-26) 2 commits - - git-p4.py: support Python 2.4 - - git-p4.py: support Python 2.5 +* ab/gitweb-use-same-scheme (2013-01-28) 1 commit + - gitweb: refer to picon/gravatar images over the same scheme - With small updates to remove dependency on newer features of - Python, keep git-p4 usable with older Python. + Avoid mixed contents on a page coming via http and https when + gitweb is hosted on a https server. Will merge to 'next'. -* jk/gc-auto-after-fetch (2013-01-26) 1 commit - - Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetch - (this branch uses jk/maint-gc-auto-after-fetch.) +* jk/python-styles (2013-01-29) 1 commit + - CodingGuidelines: add Python coding guidelines - This is to resolve merge conflicts early for the same topic to - recent codebase. + Expecting a reroll. + $gmane/215007. - Will merge to 'next'. +* mn/send-email-authinfo (2013-01-29) 1 commit + - git-send-email: add ~/.authinfo parsing -* jk/maint-gc-auto-after-fetch (2013-01-26) 2 commits - - fetch-pack: avoid repeatedly re-scanning pack directory - - fetch: run gc --auto after fetching - (this branch is used by jk/gc-auto-after-fetch.) + Expecting a reroll. + $gmane/215004, $gmane/215024. - Help "fetch only" repositories that does not trigger "gc --auto" - often enough. - Will merge to 'next' via jk/gc-auto-after-fetch. +* nd/edit-branch-desc-while-detached (2013-01-30) 1 commit + (merged to 'next' on 2013-01-30 at 69307d6) + + branch: no detached HEAD check when editing another branch's description + (this branch is used by nd/branch-error-cases.) + Attempt to "branch --edit-description" an existing branch, while + being on a detached HEAD, errored out. -* jk/read-commit-buffer-data-after-free (2013-01-26) 3 commits - - logmsg_reencode: lazily load missing commit buffers - - logmsg_reencode: never return NULL - - commit: drop useless xstrdup of commit message + Will merge to 'master'. - Clarify the ownership rule for commit->buffer field, which some - callers incorrectly accessed without making sure the data is - available there. +-------------------------------------------------- +[Graduated to "master"] - Will merge to 'next'. +* bc/fix-array-syntax-for-3.0-in-completion-bash (2013-01-18) 1 commit + (merged to 'next' on 2013-01-25 at d113c1a) + + git-completion.bash: replace zsh notation that breaks bash 3.X + Fix use of an array notation that older versions of bash do not + understand. -* pw/git-p4-on-cygwin (2013-01-26) 21 commits - - git p4: introduce gitConfigBool - - git p4: avoid shell when calling git config - - git p4: avoid shell when invoking git config --get-all - - git p4: avoid shell when invoking git rev-list - - git p4: avoid shell when mapping users - - git p4: disable read-only attribute before deleting - - git p4 test: use test_chmod for cygwin - - git p4: cygwin p4 client does not mark read-only - - git p4 test: avoid wildcard * in windows - - git p4 test: use LineEnd unix in windows tests too - - git p4 test: newline handling - - git p4: scrub crlf for utf16 files on windows - - git p4: remove unreachable windows \r\n conversion code - - git p4 test: translate windows paths for cygwin - - git p4 test: start p4d inside its db dir - - git p4 test: use client_view in t9806 - - git p4 test: avoid loop in client_view - - git p4 test: use client_view to build the initial client - - git p4: generate better error message for bad depot path - - git p4: remove unused imports - - git p4: temp branch name should use / even on windows - - Improve "git p4" on Cygwin. The cover letter said it is not yet - ready for full Windows support so I won't move this to 'next' until - told by the author (the area maintainer) otherwise. +* dl/am-hg-locale (2013-01-18) 1 commit + (merged to 'next' on 2013-01-25 at 3419019) + + am: invoke perl's strftime in C locale -* ss/mergetools-tortoise (2013-01-26) 2 commits - - mergetools: allow passing pathnames with SP in them to TortoiseGitMerge - - mergetools: support TortoiseGitMerge + Datestamp recorded in "Hg" format patch was reformatted incorrectly + to an e-mail looking date using locale dependant strftime, causing + patch application to fail. - Update mergetools to work better with newer merge helper tortoise ships. - Will merge to 'next'. +* jc/help (2013-01-18) 1 commit + (merged to 'next' on 2013-01-25 at b2b087e) + + help: include only in one file + A header file that has the definition of a static array was + included in two places, wasting the space. -* da/mergetool-docs (2013-01-27) 4 commits - - doc: generate a list of valid merge tools - - mergetool--lib: add functions for finding available tools - - mergetool--lib: improve the help text in guess_merge_tool() - - mergetool--lib: simplify command expressions - (this branch uses jk/mergetool.) - Build on top of the clean-up done by jk/mergetool and automatically - generate the list of mergetool and difftool backends the build - supports to be included in the documentation. +* nd/magic-pathspec-from-root (2013-01-21) 2 commits + (merged to 'next' on 2013-01-25 at b056b57) + + grep: avoid accepting ambiguous revision + + Update :/abc ambiguity check - This may still need to be fixed up at minor details; I'd like to - see a review from John Keeping on these. + When giving arguments without "--" disambiguation, object names + that come earlier on the command line must not be interpretable as + pathspecs and pathspecs that come later on the command line must + not be interpretable as object names. Tweak the disambiguation + rule so that ":/" (no other string before or after) is always + interpreted as a pathspec, to avoid having to say "git cmd -- :/". -* nd/branch-error-cases (2013-01-27) 4 commits - - branch: mark more strings for translation - - branch: give a more helpful message on redundant arguments - - branch: reject -D/-d without branch name - - branch: no detached HEAD check when editing another branch's description +* rr/minimal-stat (2013-01-22) 1 commit + (merged to 'next' on 2013-01-25 at 11c4453) + + Enable minimal stat checking - Fix various error messages and conditions in "git branch", e.g. we - advertised "branch -d/-D" to remove one or more branches but actually - implemented removal of zero or more branches---request to remove no - branches was not rejected. + Some reimplementations of Git does not write all the stat info back + to the index due to their implementation limitations (e.g. jgit + running on Java). A configuration option can tell Git to ignore + changes to most of the stat fields and only pay attention to mtime + and size, which these implementations can reliably update. This + avoids excessive revalidation of contents. + + +* tb/t0050-maint (2013-01-21) 3 commits + (merged to 'next' on 2013-01-25 at 682b1e2) + + t0050: Use TAB for indentation + + t0050: honor CASE_INSENSITIVE_FS in add (with different case) + + t0050: known breakage vanished in merge (case change) - Will merge to 'next', perhaps after rebasing on an older base - so that this can later be merged to the maintenance track. + Update tests that were expecting to fail due to a bug that was + fixed earlier. -------------------------------------------------- [Stalled] -* mp/complete-paths (2013-01-11) 1 commit - - git-completion.bash: add support for path completion +* 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 - 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. + contrib/subtree updates; there are a few more from T. Zheng that + were posted separately, with an overlap. + + Expecting a reroll. - Waiting for area-experts' help and review. + +* mp/diff-algo-config (2013-01-16) 3 commits + - diff: Introduce --diff-algorithm command line option + - config: Introduce diff.algorithm variable + - git-completion.bash: Autocomplete --minimal and --histogram for git-diff + + Add diff.algorithm configuration so that the user does not type + "diff --histogram". + + Looking better; may want tests to protect it from future breakages, + but otherwise it looks ready for 'next'. + + Expecting a follow-up to add tests. + + +* mb/gitweb-highlight-link-target (2012-12-20) 1 commit + - Highlight the link target line in Gitweb using CSS + + Expecting a reroll. + $gmane/211935 * jl/submodule-deinit (2012-12-04) 1 commit @@ -271,46 +282,178 @@ repositories listed at -------------------------------------------------- [Cooking] +* mp/complete-paths (2013-01-11) 1 commit + (merged to 'next' on 2013-01-30 at 70e4f1a) + + 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. + + This is logically the right thing to do, and we would really love + to see people who have been involved in completion code to review + and comment on the implementation. + + Will cook in 'next' to see if anybody screams. + + +* bc/git-p4-for-python-2.4 (2013-01-26) 2 commits + (merged to 'next' on 2013-01-30 at 5d81ed2) + + git-p4.py: support Python 2.4 + + git-p4.py: support Python 2.5 + + With small updates to remove dependency on newer features of + Python, keep git-p4 usable with older Python. + + Will merge to 'master'. + + +* jk/gc-auto-after-fetch (2013-01-26) 1 commit + (merged to 'next' on 2013-01-30 at 472d07b) + + Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetch + (this branch uses jk/maint-gc-auto-after-fetch.) + + This is to resolve merge conflicts early for the same topic to + recent codebase. + + Will merge to 'master'. + + +* jk/maint-gc-auto-after-fetch (2013-01-26) 2 commits + + fetch-pack: avoid repeatedly re-scanning pack directory + + fetch: run gc --auto after fetching + (this branch is used by jk/gc-auto-after-fetch.) + + Help "fetch only" repositories that do not trigger "gc --auto" + often enough. + + Will merge to 'master' via jk/gc-auto-after-fetch and later merge to 'maint'. + + +* jk/read-commit-buffer-data-after-free (2013-01-26) 3 commits + (merged to 'next' on 2013-01-30 at c6d7e16) + + logmsg_reencode: lazily load missing commit buffers + + logmsg_reencode: never return NULL + + commit: drop useless xstrdup of commit message + + Clarify the ownership rule for commit->buffer field, which some + callers incorrectly accessed without making sure it is populated. + + Will merge to 'master'. + + +* pw/git-p4-on-cygwin (2013-01-26) 21 commits + (merged to 'next' on 2013-01-30 at 958ae3a) + + git p4: introduce gitConfigBool + + git p4: avoid shell when calling git config + + git p4: avoid shell when invoking git config --get-all + + git p4: avoid shell when invoking git rev-list + + git p4: avoid shell when mapping users + + git p4: disable read-only attribute before deleting + + git p4 test: use test_chmod for cygwin + + git p4: cygwin p4 client does not mark read-only + + git p4 test: avoid wildcard * in windows + + git p4 test: use LineEnd unix in windows tests too + + git p4 test: newline handling + + git p4: scrub crlf for utf16 files on windows + + git p4: remove unreachable windows \r\n conversion code + + git p4 test: translate windows paths for cygwin + + git p4 test: start p4d inside its db dir + + git p4 test: use client_view in t9806 + + git p4 test: avoid loop in client_view + + git p4 test: use client_view to build the initial client + + git p4: generate better error message for bad depot path + + git p4: remove unused imports + + git p4: temp branch name should use / even on windows + + Improve "git p4" on Cygwin. + + Will merge to 'master'. + + +* ss/mergetools-tortoise (2013-01-26) 2 commits + - mergetools: allow passing pathnames with SP in them to TortoiseGitMerge + - mergetools: support TortoiseGitMerge + + Update mergetools to work better with newer merge helper tortoise ships. + + Will merge to 'next'. + + +* da/mergetool-docs (2013-01-30) 4 commits + - doc: generate a list of valid merge tools + - mergetool--lib: add functions for finding available tools + - mergetool--lib: improve the help text in guess_merge_tool() + - mergetool--lib: simplify command expressions + (this branch uses jk/mergetool.) + + Build on top of the clean-up done by jk/mergetool and automatically + generate the list of mergetool and difftool backends the build + supports to be included in the documentation. + + This is looking ready for 'next'. + + +* nd/branch-error-cases (2013-01-30) 4 commits + - branch: mark more strings for translation + - Merge branch 'nd/edit-branch-desc-while-detached' into HEAD + - branch: give a more helpful message on redundant arguments + - branch: reject -D/-d without branch name + (this branch uses nd/edit-branch-desc-while-detached.) + + Fix various error messages and conditions in "git branch", e.g. we + advertised "branch -d/-D" to remove one or more branches but actually + implemented removal of zero or more branches---request to remove no + branches was not rejected. + + Will merge to 'next'. + + * jc/push-reject-reasons (2013-01-24) 4 commits - - push: finishing touches to explain REJECT_ALREADY_EXISTS better - - push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE - - push: further simplify the logic to assign rejection reason - - push: further clean up fields of "struct ref" + (merged to 'next' on 2013-01-28 at b60be93) + + push: finishing touches to explain REJECT_ALREADY_EXISTS better + + push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE + + push: further simplify the logic to assign rejection reason + + push: further clean up fields of "struct ref" Improve error and advice messages given locally when "git push" refuses when it cannot compute fast-forwardness by separating these cases from the normal "not a fast-forward; merge first and push again" case. - Will merge to 'next'. + Will merge to 'master'. * as/test-cleanup (2013-01-24) 1 commit - - t7102 (reset): don't hardcode SHA-1 in expected outputs + (merged to 'next' on 2013-01-28 at cc1147d) + + t7102 (reset): don't hardcode SHA-1 in expected outputs - Will merge to 'next'. + Will merge to 'master'. * jc/do-not-let-random-file-interfere-with-completion-tests (2013-01-24) 1 commit - - t9902: protect test from stray build artifacts + (merged to 'next' on 2013-01-28 at df27f53) + + t9902: protect test from stray build artifacts Scripts to test bash completion was inherently flaky as it was affected by whatever random things the user may have on $PATH. - Will merge to 'next'. + Will merge to 'master'. * jk/cvsimport-does-not-work-with-cvsps3 (2013-01-24) 1 commit - - git-cvsimport.txt: cvsps-2 is deprecated + (merged to 'next' on 2013-01-28 at fef4eb2) + + git-cvsimport.txt: cvsps-2 is deprecated Warn people that other tools are more recommendable over cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport will not work with cvsps3. - Will merge to 'next'. + Will merge to 'master'. -* jk/mergetool (2013-01-27) 8 commits +* jk/mergetool (2013-01-28) 8 commits - mergetools: simplify how we handle "vim" and "defaults" - mergetool--lib: don't call "exit" in setup_tool - mergetool--lib: improve show_tool_help() output @@ -323,89 +466,44 @@ repositories listed at Cleans up mergetool/difftool combo. - Will merge to 'next'. + This is looking ready for 'next'. * jn/do-not-drop-username-when-reading-from-etc-mailname (2013-01-25) 1 commit - - ident: do not drop username when reading from /etc/mailname + (merged to 'next' on 2013-01-28 at e0a8222) + + ident: do not drop username when reading from /etc/mailname We used to stuff "user@" and then append what we read from /etc/mailname to come up with a default e-mail ident, but a bug lost the "user@" part. This is to fix it. - Will merge to 'next'. + Will merge to 'master'. -* mm/add-u-A-sans-pathspec (2013-01-25) 1 commit - - add: warn when -u or -A is used without pathspec +* mm/add-u-A-sans-pathspec (2013-01-28) 1 commit + (merged to 'next' on 2013-01-28 at fe762a6) + + add: warn when -u or -A is used without pathspec Forbid "git add -u" and "git add -A" without pathspec run from a subdirectory, to train people to type "." (or ":/") to make the choice of default does not matter. - Will merge to 'next'. - - -* bc/fix-array-syntax-for-3.0-in-completion-bash (2013-01-18) 1 commit - (merged to 'next' on 2013-01-25 at d113c1a) - + git-completion.bash: replace zsh notation that breaks bash 3.X - - Fix use of an array notation that older versions of bash do not - understand. - Will merge to 'master'. -* jc/help (2013-01-18) 1 commit - (merged to 'next' on 2013-01-25 at b2b087e) - + help: include only in one file - - A header file that has the definition of a static array was - included in two places, wasting the space. - - Will merge to 'master'. - - -* jc/hidden-refs (2013-01-18) 2 commits - - upload-pack: allow hiding ref hiearchies +* jc/hidden-refs (2013-01-30) 8 commits + - WIP: receive.allowupdatestohidden + - fetch: fetch objects by their exact SHA-1 object names + - upload-pack: optionally allow fetching from the tips of hidden refs + - fetch: use struct ref to represent refs to be fetched + - parse_fetch_refspec(): clarify the codeflow a bit + - upload/receive-pack: allow hiding ref hierarchies + - upload-pack: simplify request validation - upload-pack: share more code - Allow the server side to unclutter the refs/ namespace it shows by - default, while still allowing requests for histories leading to the - tips of hidden refs by updated clients (which are not written yet). - - -* jk/update-install-for-p4 (2013-01-20) 1 commit - - INSTALL: git-p4 doesn't support Python 3 - - Will merge to 'next'. - - -* tb/t0050-maint (2013-01-21) 3 commits - (merged to 'next' on 2013-01-25 at 682b1e2) - + t0050: Use TAB for indentation - + t0050: honor CASE_INSENSITIVE_FS in add (with different case) - + t0050: known breakage vanished in merge (case change) - - Update tests that were expecting to fail due to a bug that was - fixed earlier. - - Will merge to 'master'. - - -* nd/magic-pathspec-from-root (2013-01-21) 2 commits - (merged to 'next' on 2013-01-25 at b056b57) - + grep: avoid accepting ambiguous revision - + Update :/abc ambiguity check - - When giving arguments without "--" disambiguation, object names - that come earlier on the command line must not be interpretable as - pathspecs and pathspecs that come later on the command line must - not be interpretable as object names. Tweak the disambiguation - rule so that ":/" (no other string before or after) is always - interpreted as a pathspec, to avoid having to say "git cmd -- :/". - - Will merge to 'master'. + Allow the server side to unclutter the refs/ namespace it shows to + the client. Optionally allow requests for histories leading to the + tips of hidden refs by updated clients. * ta/doc-no-small-caps (2013-01-22) 10 commits @@ -431,36 +529,24 @@ repositories listed at to 'next'. -* rr/minimal-stat (2013-01-22) 1 commit - (merged to 'next' on 2013-01-25 at 11c4453) - + Enable minimal stat checking - - Some reimplementations of Git does not write all the stat info back - to the index due to their implementation limitations (e.g. jgit - running on Java). A configuration option can tell Git to ignore - changes to most of the stat fields and only pay attention to mtime - and size, which these implementations can reliably update. This - avoids excessive revalidation of contents. - - Will merge to 'master'. - - * jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit - - simplify-merges: drop merge from irrelevant side branch + (merged to 'next' on 2013-01-30 at b639b47) + + simplify-merges: drop merge from irrelevant side branch The --simplify-merges logic did not cull irrelevant parents from a merge that is otherwise not interesting with respect to the paths we are following. - As this touches a fairly core part of the revision traversal - infrastructure, it is appreciated to have an extra set of eyes for - sanity check. + This touches a fairly core part of the revision traversal + infrastructure; even though I think this change is correct, please + report immediately if you find any unintended side effect. Will merge to 'next'. -* jk/remote-helpers-in-python-3 (2013-01-27) 9 commits - - git-remote-testpy: fix path hashing on Python 3 +* jk/remote-helpers-in-python-3 (2013-01-28) 9 commits + (merged to 'next' on 2013-01-28 at d898471) + + git-remote-testpy: fix path hashing on Python 3 (merged to 'next' on 2013-01-25 at acf9419) + git-remote-testpy: call print as a function + git-remote-testpy: don't do unbuffered text I/O @@ -473,49 +559,25 @@ repositories listed at Prepare remote-helper test written in Python to be run with Python3. - Waiting for the final review and Ack, perhaps from Michael. - - -* dl/am-hg-locale (2013-01-18) 1 commit - (merged to 'next' on 2013-01-25 at 3419019) - + am: invoke perl's strftime in C locale - - Datestamp recorded in "Hg" format patch was reformatted incorrectly - to an e-mail looking date using locale dependant strftime, causing - patch application to fail. - Will merge to 'master'. * jk/config-parsing-cleanup (2013-01-23) 8 commits - - reflog: use parse_config_key in config callback - - help: use parse_config_key for man config - - submodule: simplify memory handling in config parsing - - submodule: use parse_config_key when parsing config - - userdiff: drop parse_driver function - - convert some config callbacks to parse_config_key - - archive-tar: use parse_config_key when parsing config - - config: add helper function for parsing key names + (merged to 'next' on 2013-01-28 at 9bc9411) + + reflog: use parse_config_key in config callback + + help: use parse_config_key for man config + + submodule: simplify memory handling in config parsing + + submodule: use parse_config_key when parsing config + + userdiff: drop parse_driver function + + convert some config callbacks to parse_config_key + + archive-tar: use parse_config_key when parsing config + + config: add helper function for parsing key names Configuration parsing for tar.* configuration variables were broken. Introduce a new config-keyname parser API to make the callers much less error prone. - Will merge to 'next'. - - -* mp/diff-algo-config (2013-01-16) 3 commits - - diff: Introduce --diff-algorithm command line option - - config: Introduce diff.algorithm variable - - git-completion.bash: Autocomplete --minimal and --histogram for git-diff - - Add diff.algorithm configuration so that the user does not type - "diff --histogram". - - Looking better; may want tests to protect it from future breakages, - but otherwise it looks ready for 'next'. - - Expecting a follow-up to add tests. + Will merge to 'master'. * jc/custom-comment-char (2013-01-16) 1 commit @@ -532,7 +594,7 @@ repositories listed at converted (it should not matter, as the file is not really a free-form text). - I don't know how useful this will be in real life, though. + Will merge to 'master'. * nd/fetch-depth-is-broken (2013-01-11) 3 commits @@ -546,7 +608,7 @@ repositories listed at unclear how to wipe the shallowness of the repository with the command, and documentation was misleading. - Will cook in 'next'. + Will merge to 'master'. * jc/no-git-config-in-clone (2013-01-11) 1 commit @@ -558,22 +620,7 @@ repositories listed at quite a while ago, but "git clone" internally set, exported, and then unexported the variable during its operation unnecessarily. - Will cook in '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; there are a few more from T. Zheng that - were posted separately, with an overlap. - - Expecting a reroll. + Will merge to 'master'. * jc/push-2.0-default-to-simple (2013-01-16) 14 commits @@ -597,13 +644,6 @@ repositories listed at Will cook in 'next' until Git 2.0 ;-). -* mb/gitweb-highlight-link-target (2012-12-20) 1 commit - - Highlight the link target line in Gitweb using CSS - - Expecting a reroll. - $gmane/211935 - - * bc/append-signed-off-by (2013-01-27) 11 commits - Unify appending signoff in format-patch, commit and sequencer - format-patch: update append_signoff prototype @@ -619,4 +659,10 @@ repositories listed at Rerolled. With help from Jonathan, I think this is getting closer. +-------------------------------------------------- +[Discarded] + +* jk/update-install-for-p4 (2013-01-20) 1 commit + . INSTALL: git-p4 doesn't support Python 3 + Made obsolete by bc/git-p4-for-python-2.4 topic. -- 2.11.4.GIT