{"thread":{"id":"39763","subject":"What's cooking in git.git (Jul 2015, #01; Wed, 1)","startedAt":"2015-07-01T22:37:04Z","lastAt":"2015-07-22T21:14:14Z","messageCount":9,"participants":["Junio C Hamano","Matthieu Moy","Jakub Narębski","Tony Finch"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"265376","messageId":"xmqqzj3f5wtr.fsf@gitster.dls.corp.google.com","threadId":"39763","inReplyTo":null,"subject":"What's cooking in git.git (Jul 2015, #01; Wed, 1)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-07-01T22:37:04Z","receivedAt":"2015-07-01T22:37:04Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"What's cooking in git.git (Jul 2015, #01; Wed, 1)\n--------------------------------------------------\n\nHere are the topics that have been cooking.  Commits prefixed with\n'-' are only in 'pu' (proposed updates) while commits prefixed with\n'+' are in 'next'.\n\nYou can find the changes described here in the integration branches\nof the repositories listed at\n\n    http://git-blame.blogspot.com/p/git-public-repositories.html\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* da/mergetool-winmerge (2015-06-19) 1 commit\n  (merged to 'next' on 2015-06-24 at 2fb10c4)\n + mergetool-lib: fix default tool selection\n\n Hotfix for an earlier change already in 'master' that broke the\n default tool selection for mergetool.\n\n\n* jc/prompt-document-ps1-state-separator (2015-06-10) 1 commit\n  (merged to 'next' on 2015-06-24 at e4d1bad)\n + git-prompt.sh: document GIT_PS1_STATESEPARATOR\n\n Docfix.\n\n\n* me/fetch-into-shallow-safety (2015-06-17) 1 commit\n  (merged to 'next' on 2015-06-24 at 8ecc19a)\n + fetch-pack: check for shallow if depth given\n\n \"git fetch --depth=<depth>\" and \"git clone --depth=<depth>\" issued\n a shallow transfer request even to an upload-pack that does not\n support the capability.\n\n\n* mm/describe-doc (2015-06-16) 1 commit\n  (merged to 'next' on 2015-06-24 at 75e34cc)\n + Documentation/describe: improve one-line summary\n\n Docfix.\n\n--------------------------------------------------\n[New Topics]\n\n* jk/rev-list-no-bitmap-while-pruning (2015-07-01) 1 commit\n - rev-list: disable --use-bitmap-index when pruning commits\n\n A minor bugfix when pack bitmap was brought in.\n\n Will merge to 'next'.\n\n\n* kb/config-unmap-before-renaming (2015-06-30) 1 commit\n - config.c: fix writing config files on Windows network shares\n\n Will merge to 'next'.\n\n\n* ls/hint-rev-list-count (2015-07-01) 1 commit\n - rev-list: add --count to usage guide\n\n Will merge to 'next'.\n\n\n* mh/fast-import-get-mark (2015-07-01) 1 commit\n - fast-import: add a get-mark command\n\n Will merge to 'next'.\n\n\n* nd/dwim-wildcards-as-pathspecs (2015-07-01) 1 commit\n - Add tests for wildcard \"path vs ref\" disambiguation\n\n Will merge to 'next' and then to 'master'.\n\n--------------------------------------------------\n[Stalled]\n\n* sg/config-name-only (2015-05-28) 3 commits\n - completion: use new 'git config' options to reliably list variable names\n - SQUASH\n - config: add options to list only variable names\n\n \"git config --list\" output was hard to parse when values consist of\n multiple lines.  Introduce a way to show only the keys.\n\n Adding a single --name-only option may be a better way to go than\n adding two new options.\n\n Expecting a reroll.\n\n\n* kk/log-merges-config (2015-04-21) 5 commits\n - bash-completion: add support for git-log --merges= and log.merges\n - t4202-log: add tests for --merges=\n - Documentation: add git-log --merges= option and log.merges config. var\n - log: honor log.merges= option\n - revision: add --merges={show|only|hide} option\n\n \"git log\" (but not other commands in the \"log\" family) learned to\n pay attention to the log.merges configuration variable that can be\n set to \"show\" (the normal behaviour), \"only\" (hide non-merge\n commits), or \"hide\" (hide merge commits).  --merges=(show|only|hide)\n can be used to override the setting from the command line.\n\n The documentation may need to be updated once more ($gmane/267250).\n Waiting for a reroll.\n\n\n* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits\n - t/lib-git-svn: check same httpd module dirs as lib-httpd\n - t/lib-httpd: load mod_unixd\n\n This is the first two commits in a three-patch series $gmane/266962\n Will be rerolled.\n with updated log message ($gmane/268061).\n\n\n* mh/numparse (2015-03-19) 14 commits\n - diff_opt_parse(): use convert_i() when handling --abbrev=<num>\n - diff_opt_parse(): use convert_i() when handling \"-l<num>\"\n - opt_arg(): simplify pointer handling\n - opt_arg(): report errors parsing option values\n - opt_arg(): use convert_i() in implementation\n - opt_arg(): val is always non-NULL\n - builtin_diff(): detect errors when parsing --unified argument\n - handle_revision_opt(): use convert_ui() when handling \"--abbrev=\"\n - strtoul_ui(), strtol_i(): remove functions\n - handle_revision_opt(): use convert_i() when handling \"-<digit>\"\n - handle_revision_opt(): use skip_prefix() in many places\n - write_subdirectory(): use convert_ui() for parsing mode\n - cacheinfo_callback(): use convert_ui() when handling \"--cacheinfo\"\n - numparse: new module for parsing integral numbers\n\n Many codepaths use unchecked use of strtol() and friends (or even\n worse, atoi()).  Introduce a set of wrappers that try to be more\n careful.\n\n Expecting a reroll.\n ($gmane/268058).\n\n\n* tf/gitweb-project-listing (2015-03-19) 5 commits\n - gitweb: make category headings into links when they are directories\n - gitweb: optionally set project category from its pathname\n - gitweb: add a link under the search box to clear a project filter\n - gitweb: if the PATH_INFO is incomplete, use it as a project_filter\n - gitweb: fix typo in man page\n\n Update gitweb to make it more pleasant to deal with a hierarchical\n forest of repositories.\n\n Any comments from those who use or have their own code in Gitweb?\n\n\n* jc/a-lone-dash-stands-for-previous-branch (2015-03-16) 1 commit\n - \"-\" and \"@{-1}\" on various programs\n\n Lose special case code to make a lone dash \"-\" mean the previous\n branch aka \"@{-1}\" from a handful subcommands, and instead support\n the notation throughout the system by reimplementing it at the\n revisions layer.\n\n Needs tests, documentation updates, etc.  Also does only a half-way\n job dealing with range notation, which needs to be fixed before the\n series goes anywhere.\n\n\n* nd/list-files (2015-02-09) 21 commits\n - t3080: tests for git-list-files\n - list-files: -M aka diff-cached\n - list-files -F: show submodules with the new indicator '&'\n - list-files: add -F/--classify\n - list-files: show directories as well as files\n - list-files: do not show duplicate cached entries\n - list-files: sort output and remove duplicates\n - list-files: add -t back\n - list-files: add -1 short for --no-column\n - list-files: add -R/--recursive short for --max-depth=-1\n - list-files: -u does not imply showing stages\n - list-files: make alias 'ls' default to 'list-files'\n - list-files: a user friendly version of ls-files and more\n - ls-files: support --max-depth\n - ls-files: add --column\n - ls-files: add --color to highlight file names\n - ls-files: buffer full item in strbuf before printing\n - ls_colors.c: highlight submodules like directories\n - ls_colors.c: add a function to color a file name\n - ls_colors.c: parse color.ls.* from config file\n - ls_colors.c: add $LS_COLORS parsing code\n\n A new \"git list-files\" Porcelain command, \"ls-files\" with bells and\n whistles.\n\n Reroll to base on wt-status work ($gmane/265142) has seen some\n positive discussions.\n\n Waiting for a further polished reroll ($gmane/265534).\n\n\n* nd/pathspec-strip-fix (2015-04-18) 1 commit\n - pathspec: adjust prefixlen after striping trailing slash\n\n Does not quite fix ($gmane/267614).\n Will discard.\n\n\n* jc/diff-b-m (2015-02-23) 5 commits\n . WIPWIP\n . WIP: diff-b-m\n - diffcore-rename: allow easier debugging\n - diffcore-rename.c: add locate_rename_src()\n - diffcore-break: allow debugging\n\n \"git diff -B -M\" produced incorrect patch when the postimage of a\n completely rewritten file is similar to the preimage of a removed\n file; such a resulting file must not be expressed as a rename from\n other place.\n\n The fix in this patch is broken, unfortunately.\n\n\n* pw/remote-set-url-fetch (2014-11-26) 1 commit\n - remote: add --fetch and --both options to set-url\n\n Expecting a reroll.\n\n\n* tr/remerge-diff (2014-11-10) 9 commits\n - t4213: avoid \"|\" in sed regexp\n - log --remerge-diff: show what the conflict resolution changed\n - name-hash: allow dir hashing even when !ignore_case\n - merge-recursive: allow storing conflict hunks in index\n - merge_diff_mode: fold all merge diff variants into an enum\n - combine-diff: do not pass revs->dense_combined_merges redundantly\n - merge-recursive: -Xindex-only to leave worktree unchanged\n - merge-recursive: internal flag to avoid touching the worktree\n - merge-recursive: remove dead conditional in update_stages()\n\n \"log -p\" output learns a new way to let users inspect a merge\n commit by showing the differences between the automerged result\n with conflicts the person who recorded the merge would have seen\n and the final conflict resolution that was recorded in the merge.\n\n Waiting for a reroll.\n ($gmane/256591).\n\n\n* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits\n - perf-lib: add test_perf_cleanup target\n - perf-lib: split starting the test from the execution\n\n Add test_perf_cleanup shell function to the perf suite, that allows\n the script writers to define a test with a clean-up action.\n\n Will hold.\n\n\n* jc/show-branch (2014-03-24) 5 commits\n - show-branch: use commit slab to represent bitflags of arbitrary width\n - show-branch.c: remove \"all_mask\"\n - show-branch.c: abstract out \"flags\" operation\n - show-branch.c: lift all_mask/all_revs to a global static\n - show-branch.c: update comment style\n\n Waiting for the final step to lift the hard-limit.\n\n--------------------------------------------------\n[Cooking]\n\n* kb/i18n-doc (2015-07-01) 1 commit\n - Documentation/i18n.txt: clarify character encoding support\n\n Will merge to 'next'.\n\n\n* kb/use-nsec-doc (2015-07-01) 1 commit\n - Makefile / racy-git.txt: clarify USE_NSEC prerequisites\n\n Will merge to 'next'.\n\n\n* dt/refs-backend-preamble (2015-06-30) 8 commits\n - git-stash: use git-reflog instead of creating files\n - SQUASH???\n - git-reflog: add create and exists functions\n - refs: new public ref function: safe_create_reflog\n - refs: break out check for reflog autocreation\n - bisect: treat BISECT_HEAD as a ref\n - cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs\n - refs.c: add err arguments to reflog functions\n\n In preparation for allowing different \"backends\" to store the refs\n in a way different from the traditional \"one ref per file in $GIT_DIR\n or in a $GIT_DIR/packed-refs file\" filesystem storage, reduce\n direct filesystem access to ref-like things like CHERRY_PICK_HEAD\n from scripts and programs.\n\n Will merge to 'next' after squashing the fix in.\n\n\n* et/http-proxyauth (2015-06-29) 1 commit\n - http: always use any proxy auth method available\n\n We used to ask libCURL to use the most secure authentication method\n available when talking to an HTTP proxy only when we were told to\n talk to one via configuration variables.  We now ask libCURL to\n always use the most secure authentication method, because the user\n can tell libCURL to use an HTTP proxy via an environment variable\n without using configuration variables.\n\n Looked sensible.  An extra set of eyes appreciated, but I think\n this is ready.\n\n Will merge to 'next'.\n\n\n* jc/fsck-retire-require-eoh (2015-06-28) 1 commit\n - fsck: it is OK for a tag and a commit to lack the body\n\n A fix to a minor regression to \"git fsck\" in v2.2 era that started\n complaining about a body-less tag object when it lacks a separator\n empty line after its header to separate it with a non-existent body.\n\n Will merge to 'next'.\n\n\n* jk/date-mode-format (2015-06-29) 3 commits\n - introduce \"format\" date-mode\n - convert \"enum date_mode\" into a struct\n - show-branch: use DATE_RELATIVE instead of magic number\n\n Teach \"git log\" and friends a new \"--date=format:...\" option to\n format timestamps using system's strftime(3).\n\n Will merge to 'next'.\n\n\n* jk/still-interesting (2015-06-29) 1 commit\n - revision.c: remove unneeded check for NULL\n\n Code clean-up.\n\n Will merge to 'next'.\n\n\n* nd/export-worktree (2015-06-26) 1 commit\n - setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR\n\n Running an aliased command from a subdirectory when the .git thing\n in the working tree is a gitfile pointing elsewhere did not work.\n\n Will merge to 'next'.\n\n\n* sb/p5310-and-chain (2015-06-26) 1 commit\n - p5310: Fix broken && chain in performance test\n\n Code clean-up.\n\n Will merge to 'next'.\n\n\n* jc/rerere (2015-06-30) 13 commits\n - rerere: refactor \"replay\" part of do_plain_rerere()\n - rerere: explain the remainder\n - rerere: explain \"rerere forget\" codepath\n - rerere: explain the primary codepath\n - rerere: explain MERGE_RR management helpers\n - rerere: explain the rerere I/O abstraction\n - rerere: stop looping unnecessarily\n - rerere: drop want_sp parameter from is_cmarker()\n - rerere: report autoupdated paths only after actually updating them\n - rerere: write out each record of MERGE_RR in one go\n - rerere: lift PATH_MAX limitation\n - rerere: plug conflict ID leaks\n - rerere: fix an off-by-one non-bug\n\n Code clean-up and minor fixes.\n\n\n* ad/bisect-terms (2015-06-29) 10 commits\n - bisect: allow setting any user-specified in 'git bisect start'\n - bisect: add 'git bisect terms' to view the current terms\n - bisect: add the terms old/new\n - bisect: sanity check on terms\n - bisect: don't mix option parsing and non-trivial code\n - bisect: simplify the addition of new bisect terms\n - bisect: replace hardcoded \"bad|good\" by variables\n - Documentation/bisect: revise overall content\n - Documentation/bisect: move getting help section to the end\n - bisect: correction of typo\n\n The use of 'good/bad' in \"git bisect\" made it confusing to use when\n hunting for a state change that is not a regression (e.g. bugfix).\n The command learned 'old/new' and then allows the end user to\n say e.g. \"bisect start --term-old=fast --term=new=slow\" to find a\n performance regression.\n\n The bottom part has been quite well cooked.  Perhaps split it into\n two topisc and merge the earlier ones to 'next' before the rest\n settles.  Michael's idea to make 'good/bad' more intelligent does\n have certain attractiveness ($gname/272867).\n\n\n* mh/tempfile (2015-06-10) 14 commits\n - credential-cache--daemon: use tempfile module\n - credential-cache--daemon: delete socket from main()\n - gc: use tempfile module to handle gc.pid file\n - lock_repo_for_gc(): compute the path to \"gc.pid\" only once\n - diff: use tempfile module\n - setup_temporary_shallow(): use tempfile module\n - write_shared_index(): use tempfile module\n - register_tempfile(): new function to handle an existing temporary file\n - tempfile: add several functions for creating temporary files\n - register_tempfile_object(): new function, extracted from create_tempfile()\n - commit_lock_file(): use get_locked_file_path()\n - lockfile: remove some redundant functions\n - tempfile: a new module for handling temporary files\n - Move lockfile API documentation to lockfile.h\n\n Rebuild \"lockfile\" API on top of a new \"tempfile\" API.\n This needs rerolling, to include \"tempfile.h\" in \"lockfile.h\", at\n least.\n\n Expecting a reroll.\n ($gmane/271353)\n\n\n* js/fsck-opt (2015-06-23) 19 commits\n - fsck: support ignoring objects in `git fsck` via fsck.skiplist\n - fsck: git receive-pack: support excluding objects from fsck'ing\n - fsck: introduce `git fsck --connectivity-only`\n - fsck: support demoting errors to warnings\n - fsck: document the new receive.fsck.<msg-id> options\n - fsck: allow upgrading fsck warnings to errors\n - fsck: optionally ignore specific fsck issues completely\n - fsck: disallow demoting grave fsck errors to warnings\n - fsck: add a simple test for receive.fsck.<msg-id>\n - fsck: make fsck_tag() warn-friendly\n - fsck: handle multiple authors in commits specially\n - fsck: make fsck_commit() warn-friendly\n - fsck: make fsck_ident() warn-friendly\n - fsck: report the ID of the error/warning\n - fsck (receive-pack): allow demoting errors to warnings\n - fsck: offer a function to demote fsck errors to warnings\n - fsck: provide a function to parse fsck message IDs\n - fsck: introduce identifiers for fsck messages\n - fsck: introduce fsck options\n\n Allow ignoring fsck errors on specific set of known-to-be-bad\n objects, and also tweaking warning level of various kinds of non\n critical breakages reported.\n\n Will merge to 'next'.\n\n\n* js/rebase-i-clean-up-upon-continue-to-skip (2015-06-29) 2 commits\n - rebase -i: do not leave a CHERRY_PICK_HEAD file behind\n - t3404: demonstrate CHERRY_PICK_HEAD bug\n\n Abandoning an already applied change in \"git rebase -i\" with\n \"--continue\" left CHERRY_PICK_HEAD and confused later steps.\n\n Will merge to 'next'.\n\n\n* rh/test-color-avoid-terminfo-in-original-home (2015-06-17) 2 commits\n  (merged to 'next' on 2015-06-24 at 6af5fa7)\n + test-lib.sh: fix color support when tput needs ~/.terminfo\n + Revert \"test-lib.sh: do tests for color support after changing HOME\"\n\n An ancient test framework enhancement to allow color was not\n entirely correct; this makes it work even when tput needs to read\n from the ~/.terminfo under the user's real HOME directory.\n\n Will merge to 'master'.\n\n\n* tb/checkout-doc (2015-06-17) 1 commit\n - git-checkout.txt: document \"git checkout <pathspec>\" better\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* jk/pretty-encoding-doc (2015-06-17) 1 commit\n - docs: clarify that --encoding can produce invalid sequences\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* ak/format-patch-odir-config (2015-06-19) 1 commit\n - format-patch: introduce format.outputDirectory configuration\n\n Reroll exists but didn't pick it up as it seems to be still\n collecting review comments.\n\n Expecting a reroll.\n ($gmane/272180).\n\n\n* bc/gpg-verify-raw (2015-06-22) 7 commits\n  (merged to 'next' on 2015-06-24 at 08a1164)\n + verify-tag: add option to print raw gpg status information\n + verify-commit: add option to print raw gpg status information\n + gpg: centralize printing signature buffers\n + gpg: centralize signature check\n + verify-commit: add test for exit status on untrusted signature\n + verify-tag: share code with verify-commit\n + verify-tag: add tests\n\n \"git verify-tag\" and \"git verify-commit\" have been taught to share\n more code, and then learned to optionally show the verification\n message from the underlying GPG implementation.\n\n Will merge to 'master'.\n\n\n* cb/parse-magnitude (2015-06-22) 2 commits\n  (merged to 'next' on 2015-06-24 at 2fd7205)\n + parse-options: move unsigned long option parsing out of pack-objects.c\n + test-parse-options: update to handle negative ints\n\n Move machinery to parse human-readable scaled numbers like 1k, 4M,\n and 2G as an option parameter's value from pack-objects to\n parse-options API, to make it available to other codepaths.\n\n Will merge to 'master'.\n\n\n* cb/subtree-tests-update (2015-06-22) 3 commits\n  (merged to 'next' on 2015-06-24 at 31a2938)\n + contrib/subtree: small tidy-up to test\n + contrib/subtree: fix broken &&-chains and revealed test error\n + contrib/subtree: use tabs consitently for indentation in tests\n\n Tests update in contrib/subtree.\n\n Will merge to 'master'.\n\n\n* jk/cat-file-batch-all (2015-06-26) 8 commits\n - cat-file: sort and de-dup output of --batch-all-objects\n - cat-file: add --batch-all-objects option\n - cat-file: split batch_one_object into two stages\n - cat-file: stop returning value from batch_one_object\n - cat-file: add --buffer option\n - cat-file: move batch_options definition to top of file\n - cat-file: minor style fix in options list\n - Merge branch 'jk/maint-for-each-packed-object' into jk/cat-file-batch-all\n (this branch uses jk/maint-for-each-packed-object.)\n\n \"cat-file\" learned \"--batch-all-objects\" option to enumerate all\n available objects in the repository more quickly than \"rev-list\n --all --objects\" (the output includes unreachable objects, though).\n\n Will merge to 'next'.\n\n\n* jk/maint-for-each-packed-object (2015-06-22) 1 commit\n  (merged to 'next' on 2015-06-24 at 162e134)\n + for_each_packed_object: automatically open pack index\n (this branch is used by jk/cat-file-batch-all.)\n\n The for_each_packed_object() API function did not iterate over\n objects in a packfile that hasn't been used yet.\n\n Will merge to 'master'.\n\n\n* jk/pkt-log-pack (2015-06-16) 3 commits\n - pkt-line: support tracing verbatim pack contents\n - pkt-line: tighten sideband PACK check when tracing\n - pkt-line: simplify starts_with checks in packet tracing\n\n Enhance packet tracing machinery to allow capturing an incoming\n pack data to a file for debugging.\n\n Will merge to 'next'.\n\n\n* kn/for-each-ref (2015-06-15) 11 commits\n  (merged to 'next' on 2015-06-24 at 1a3a734)\n + ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname\n + for-each-ref: introduce filter_refs()\n + ref-filter: move code from 'for-each-ref'\n + ref-filter: add 'ref-filter.h'\n + for-each-ref: rename variables called sort to sorting\n + for-each-ref: rename some functions and make them public\n + for-each-ref: introduce 'ref_array_clear()'\n + for-each-ref: introduce new structures for better organisation\n + for-each-ref: rename 'refinfo' to 'ref_array_item'\n + for-each-ref: clean up code\n + for-each-ref: extract helper functions out of grab_single_ref()\n (this branch is used by kn/for-each-tag-branch.)\n\n GSoC project to rebuild ref listing by branch and tag based on the\n for-each-ref machinery.  This is its first part.\n\n\n* mh/init-delete-refs-api (2015-06-22) 19 commits\n - delete_ref(): use the usual convention for old_sha1\n - cmd_update_ref(): make logic more straightforward\n - update_ref(): don't read old reference value before delete\n - check_branch_commit(): make first parameter const\n - refs.h: add some parameter names to function declarations\n - refs: move the remaining ref module declarations to refs.h\n - initial_ref_transaction_commit(): check for ref D/F conflicts\n - initial_ref_transaction_commit(): check for duplicate refs\n - refs: remove some functions from the module's public interface\n - initial_ref_transaction_commit(): function for initial ref creation\n - repack_without_refs(): make function private\n - prune_refs(): use delete_refs()\n - prune_remote(): use delete_refs()\n - delete_refs(): bail early if the packed-refs file cannot be rewritten\n - delete_refs(): make error message more generic\n - delete_refs(): new function for the refs API\n - delete_ref(): handle special case more explicitly\n - remove_branches(): remove temporary\n - delete_ref(): move declaration to refs.h\n\n Clean up refs API and make \"git clone\" less intimate with the\n implementation detail.\n\n Will merge to 'next'.\n\n\n* mh/replace-refs (2015-06-12) 1 commit\n  (merged to 'next' on 2015-06-24 at cb13adf)\n + Allow to control where the replace refs are looked for\n\n Add an environment variable to tell Git to look into refs hierarchy\n other than refs/replace/ for the object replacement data.\n\n\n* nd/multiple-work-trees (2015-07-01) 3 commits\n - worktree: replace \"checkout --to\" with \"worktree add\"\n  (merged to 'next' on 2015-06-29 at fd4eb60)\n + worktree: new place for \"git prune --worktrees\"\n  (merged to 'next' on 2015-06-24 at 7c3f918)\n + checkout: don't check worktrees when not necessary\n\n \"git checkout [<tree-ish>] <paths>\" spent unnecessary cycles\n checking if the current branch was checked out elsewhere, when we\n know we are not switching the branches ourselves.\n\n Waiting for a reroll to transition to \"worktree add\".\n\n\n* gp/status-rebase-i-info (2015-07-01) 5 commits\n - status: add new tests for status during rebase -i\n - SQUASH???\n - status: give more information during rebase -i\n - status: differentiate interactive from non-interactive rebases\n - status: factor two rebase-related messages together\n\n Teach \"git status\" to show a more detailed information regarding\n the \"rebase -i\" session in progress.\n\n Reroll exists; not picked up yet.\n\n\n* mk/utf8-no-iconv-warn (2015-06-08) 1 commit\n - utf8.c: print warning about disabled iconv\n\n Warn when a reencoding is requested in a build without iconv\n support, as the end user is likely to get an unexpected result.  I\n think the same level of safety should be added to a build with\n iconv support when the specified encoding is not available, but the\n patch does not go there.\n\n Expecting a reroll.\n\n\n* mr/rebase-i-customize-insn-sheet (2015-06-15) 1 commit\n - git-rebase--interactive.sh: add config option for custom instruction format\n\n \"git rebase -i\"'s list of todo is made configurable.\n\n Will merge to 'next'.\n\n\n* pt/am-foreign (2015-06-15) 5 commits\n  (merged to 'next' on 2015-06-24 at 838c702)\n + am: teach mercurial patch parser how to read from stdin\n + am: use gmtime() to parse mercurial patch date\n + t4150: test applying StGit series\n + am: teach StGit patch parser how to read from stdin\n + t4150: test applying StGit patch\n\n Various enhancements around \"git am\" reading patches generated by\n foreign SCM.\n\n\n* pt/pull-builtin (2015-06-18) 19 commits\n - pull: remove redirection to git-pull.sh\n - pull --rebase: error on no merge candidate cases\n - pull --rebase: exit early when the working directory is dirty\n - pull: configure --rebase via branch.<name>.rebase or pull.rebase\n - pull: teach git pull about --rebase\n - pull: set reflog message\n - pull: implement pulling into an unborn branch\n - pull: fast-forward working tree if head is updated\n - pull: check if in unresolved merge state\n - pull: support pull.ff config\n - pull: error on no merge candidates\n - pull: pass git-fetch's options to git-fetch\n - pull: pass git-merge's options to git-merge\n - pull: pass verbosity, --progress flags to fetch and merge\n - pull: implement fetch + merge\n - pull: implement skeletal builtin pull\n - argv-array: implement argv_array_pushv()\n - parse-options-cb: implement parse_opt_passthru_argv()\n - parse-options-cb: implement parse_opt_passthru()\n\n Reimplement 'git pull' in C.\n\n This is v4 ($gmane/271943).\n Will merge to 'next'.\n\n\n* rl/send-email-aliases (2015-07-01) 10 commits\n - send-email: suppress meaningless whitespaces in from field\n - send-email: allow multiple emails using --cc, --to and --bcc\n - send-email: consider quote as delimiter instead of character\n - send-email: reduce dependencies impact on parse_address_line\n - send-email: minor code refactoring\n - send-email: allow use of aliases in the From field of --compose mode\n - send-email: refactor address list process\n - t9001-send-email: refactor header variable fields replacement\n - send-email: allow aliases in patch header and command script outputs\n - t9001-send-email: move script creation in a setup test\n\n \"git send-email\" now performs alias-expansion on names that are\n given via --cccmd, etc.\n\n This round comes with a lot more enhanced e-mail address parser,\n which makes it a bit scary, but as long as it works as designed, it\n makes it wonderful ;-).\n\n Will merge to 'next'.\n\n\n* wp/sha1-name-negative-match (2015-06-08) 2 commits\n - sha1_name.c: introduce '^{/!-<negative pattern>}' notation\n - test for '!' handling in rev-parse's named commits\n\n Introduce \"branch^{/!-<pattern>}\" notation to name a commit\n reachable from branch that does not match the given pattern.\n\n Expecting a reroll.\n\n\n* bc/object-id (2015-06-17) 10 commits\n . remote.c: use struct object_id in many functions\n . object-id: use struct object_id in struct object\n . remote.c: use struct object_id in ref_newer()\n . transport-helper.c: use struct object_id in push_refs_with_export()\n . connect.c: use struct object_id in get_remote_heads()\n . remote-curl: use struct object_id in parse_fetch()\n . fetch-pack: use struct object_id in add_sought_entry_mem()\n . object_id: convert struct ref to use object_id.\n . sha1_file: introduce has_object_file() helper\n . refs: convert some internal functions to use object_id\n\n More transition from \"unsigned char[40]\" to \"struct object_id\".\n\n While GSoC and other topics are actively moving existing code\n around, this cannot go in; ejected from 'pu'.\n\n\n* jk/log-missing-default-HEAD (2015-06-03) 1 commit\n - log: diagnose empty HEAD more clearly\n\n \"git init empty && git -C empty log\" said \"bad default revision 'HEAD'\",\n which was found to be a bit confusing to new users.\n\n What's the status of this one?\n\n\n* gr/rebase-i-drop-warn (2015-06-30) 3 commits\n - git rebase -i: add static check for commands and SHA-1\n - git rebase -i: warn about removed commits\n - git-rebase -i: add command \"drop\" to remove a commit\n\n Add \"drop commit-object-name subject\" command as another way to\n skip replaying of a commit in \"rebase -i\", and then punish those\n who do not use it (and instead just remove the lines) by throwing\n a warning.\n\n Will merge to 'next'.\n\n\n* jh/strbuf-read-use-read-in-full (2015-06-01) 1 commit\n - strbuf_read(): skip unnecessary strbuf_grow() at eof\n\n Avoid one extra iteration and strbuf_grow() of 8kB in\n strbuf_read().\n\n Looked reasonable; perhaps a log message clarification is needed.\n\n Expecting a reroll.\n\n\n* mg/index-read-error-messages (2015-06-01) 2 commits\n - messages: uniform error messages for index write\n - show-index: uniform error messages for index read\n\n The tip was RFC.\n Expecting a reroll.\n\n\n* hv/submodule-config (2015-06-15) 4 commits\n - do not die on error of parsing fetchrecursesubmodules option\n - use new config API for worktree configurations of submodules\n - extract functions for submodule config set and lookup\n - implement submodule config API for lookup of .gitmodules values\n\n The gitmodules API accessed from the C code learned to cache stuff\n lazily.\n\n Looked reasonable from a cursory read.\n\n Will merge to 'next'.\n\n\n* jc/push-tags-also (2015-05-29) 1 commit\n - push --tags: push tags *in addition to* other stuff\n\n \"git fetch --tags\" learned to fetch tags in addition to other stuff\n a few years ago, but \"git push --tags\" didn't.  Now it does.\n\n A change to push out more than before always invites \"what if the\n user makes a mistake\" worries.\n\n Will discard.\n\n\n* jc/commit-slab (2015-05-22) 1 commit\n - commit-slab: introduce slabname##_peek() function\n\n Memory use reduction when commit-slab facility is used to annotate\n sparsely (which is not recommended in the first place).\n\n Will merge to 'next'.\n\n\n* jc/clone-bundle (2015-04-30) 1 commit\n - repack: optionally create a clone.bundle\n\n Waiting for further work.\n Still an early WIP.\n\n\n* ee/clean-remove-dirs (2015-06-26) 6 commits\n  (merged to 'next' on 2015-06-29 at d595659)\n + read_gitfile_gently: fix use-after-free\n  (merged to 'next' on 2015-06-24 at 7c27821)\n + clean: improve performance when removing lots of directories\n + p7300: add performance tests for clean\n + t7300: add tests to document behavior of clean and nested git\n + setup: sanity check file size in read_gitfile_gently\n + setup: add gentle version of read_gitfile\n\n Replace \"is this subdirectory a separate repository that should not\n be touched?\" check \"git clean\" does by checking if it has .git/HEAD\n using the submodule-related code with a more optimized check.\n\n Will merge to 'master'.\n\n\n* jc/merge-drop-old-syntax (2015-04-29) 1 commit\n  (merged to 'next' on 2015-05-28 at 6bfd8b9)\n + merge: drop 'git merge <message> HEAD <commit>' syntax\n\n Stop supporting \"git merge <message> HEAD <commit>\" syntax that\n has been deprecated since October 2007.\n\n Will keep in 'next' during the 2.5 cycle.\n"},{"id":"265390","messageId":"vpqbnfudhuv.fsf@anie.imag.fr","threadId":"39763","inReplyTo":"xmqqzj3f5wtr.fsf@gitster.dls.corp.google.com","subject":"Re: [PUB]What's cooking in git.git (Jul 2015, #01; Wed, 1)","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-07-02T09:33:12Z","receivedAt":"2015-07-02T09:33:12Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> * ad/bisect-terms (2015-06-29) 10 commits\n>  - bisect: allow setting any user-specified in 'git bisect start'\n>  - bisect: add 'git bisect terms' to view the current terms\n>  - bisect: add the terms old/new\n>  - bisect: sanity check on terms\n>  - bisect: don't mix option parsing and non-trivial code\n>  - bisect: simplify the addition of new bisect terms\n>  - bisect: replace hardcoded \"bad|good\" by variables\n>  - Documentation/bisect: revise overall content\n>  - Documentation/bisect: move getting help section to the end\n>  - bisect: correction of typo\n>\n>  The use of 'good/bad' in \"git bisect\" made it confusing to use when\n>  hunting for a state change that is not a regression (e.g. bugfix).\n>  The command learned 'old/new' and then allows the end user to\n>  say e.g. \"bisect start --term-old=fast --term=new=slow\" to find a\n>  performance regression.\n>\n>  The bottom part has been quite well cooked.  Perhaps split it into\n>  two topisc and merge the earlier ones to 'next' before the rest\n>  settles.  Michael's idea to make 'good/bad' more intelligent does\n>  have certain attractiveness ($gname/272867).\n\nI think it makes sense to merge the first patches soon:\n\n - bisect: don't mix option parsing and non-trivial code\n - bisect: simplify the addition of new bisect terms\n - bisect: replace hardcoded \"bad|good\" by variables\n - Documentation/bisect: revise overall content\n - Documentation/bisect: move getting help section to the end\n - bisect: correction of typo\n\nI have nothing to add on the last ones, but they can cook in pu a bit\nlonger.\n\nDo you expect anything from my side?\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"265473","messageId":"xmqqlhex3yzd.fsf@gitster.dls.corp.google.com","threadId":"39763","inReplyTo":"vpqbnfudhuv.fsf@anie.imag.fr","subject":"Re: [PUB]What's cooking in git.git (Jul 2015, #01; Wed, 1)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-07-03T17:57:58Z","receivedAt":"2015-07-03T17:57:58Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:\n\n> Junio C Hamano <gitster@pobox.com> writes:\n>\n>> * ad/bisect-terms (2015-06-29) 10 commits\n> ...\n>>  The bottom part has been quite well cooked.  Perhaps split it into\n>>  two topisc and merge the earlier ones to 'next' before the rest\n>>  settles.  Michael's idea to make 'good/bad' more intelligent does\n>>  have certain attractiveness ($gname/272867).\n>\n> I think it makes sense to merge the first patches soon:\n>\n>  - bisect: don't mix option parsing and non-trivial code\n>  - bisect: simplify the addition of new bisect terms\n>  - bisect: replace hardcoded \"bad|good\" by variables\n>  - Documentation/bisect: revise overall content\n>  - Documentation/bisect: move getting help section to the end\n>  - bisect: correction of typo\n>\n> I have nothing to add on the last ones, but they can cook in pu a bit\n> longer.\n>\n> Do you expect anything from my side?\n\nNot at this moment.  Thanks for helping this topic move forward.\n"},{"id":"266555","messageId":"55AE8ACF.6090508@gmail.com","threadId":"39763","inReplyTo":"xmqqzj3f5wtr.fsf@gitster.dls.corp.google.com","subject":"Re: What's cooking in git.git (Jul 2015, #01; Wed, 1)","fromName":"Jakub Narębski","fromEmail":"jnareb@gmail.com","sentAt":"2015-07-21T18:09:19Z","receivedAt":"2015-07-21T18:09:19Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On 2015-07-02 at 00:37, Junio C Hamano wrote:\n> What's cooking in git.git (Jul 2015, #01; Wed, 1)\n> --------------------------------------------------\n\n> * tf/gitweb-project-listing (2015-03-19) 5 commits\n>  - gitweb: make category headings into links when they are directories\n>  - gitweb: optionally set project category from its pathname\n>  - gitweb: add a link under the search box to clear a project filter\n>  - gitweb: if the PATH_INFO is incomplete, use it as a project_filter\n>  - gitweb: fix typo in man page\n> \n>  Update gitweb to make it more pleasant to deal with a hierarchical\n>  forest of repositories.\n> \n>  Any comments from those who use or have their own code in Gitweb?\n\nThe first one is a simple typo fix (plural -> singular), so it can be\naccepted without problems.\n\nSecond one, \"gitweb: if the PATH_INFO is incomplete, use it as a\nproject_filter\" looks interesting and quite useful. Though it doesn't\ndo much: it allows for handcrafted URL, and provides mechanism to\ncreate breadcrumbs. It doesn't use this feature in its output...\nWell, I think it doesn't: I cannot check it at this moment.\n\nWhat is missing is a support for query parameters path, and not only\npath info. Though that *might* be postponed for later patch; the\npath info API is obvious, query params API for this feature isn't.\nThought some thought is needed for generating (or not) breadcrumbs\nif path_info is turned off.\n\nThe third, \"gitweb: add a link under the search box to clear a project\nfilter\" notices a problem... then solves it in strange way. IMVHO\na better solution would be to add \"List all projects\" URL together\nwith \" / \" (or other separator) conditionally, if $project_filter\nis set. Or have \"List all projects\" and add \"List projects$limit\"\nif $project_filter is set.\n\nThe last two, which form the crux of this patch series, looks like\na good idea, though not without a few caveats. I am talking here\nonly about conceptual level, not about how it is coded (which has\nfew issues as well):\n\n- I think that non-bare repositories \"repo/.git\" should be\n  treated as one directory entry, i.e. gitweb should not create\n  a separate category for \"repo/\".  This is admittedly a corner\n  case, but useful for git-instaweb\n\n- I think that people would want to be able to configure how\n  many levels of directory hierarchy gets turned into categories.\n  Perhaps only top level should be turned into category? Deep\n  hierarchies means deep categories (usually with very few\n  repositories) with current implementation.\n\n- New global configuration variable, or new %features entry? \n \n> * tr/remerge-diff (2014-11-10) 9 commits\n>  - t4213: avoid \"|\" in sed regexp\n>  - log --remerge-diff: show what the conflict resolution changed\n>  - name-hash: allow dir hashing even when !ignore_case\n>  - merge-recursive: allow storing conflict hunks in index\n>  - merge_diff_mode: fold all merge diff variants into an enum\n>  - combine-diff: do not pass revs->dense_combined_merges redundantly\n>  - merge-recursive: -Xindex-only to leave worktree unchanged\n>  - merge-recursive: internal flag to avoid touching the worktree\n>  - merge-recursive: remove dead conditional in update_stages()\n> \n>  \"log -p\" output learns a new way to let users inspect a merge\n>  commit by showing the differences between the automerged result\n>  with conflicts the person who recorded the merge would have seen\n>  and the final conflict resolution that was recorded in the merge.\n> \n>  Waiting for a reroll.\n>  ($gmane/256591).\n\nIs it something that Atlassian uses as a differentiatior (instead\nof sending patch upstream):\n\n  https://developer.atlassian.com/blog/2015/01/a-better-pull-request/\n\n-- \nJakub Narębski\n"},{"id":"266604","messageId":"alpine.LSU.2.00.1507220957350.16350@hermes-1.csi.cam.ac.uk","threadId":"39763","inReplyTo":"55AE8ACF.6090508@gmail.com","subject":"Re: What's cooking in git.git (Jul 2015, #01; Wed, 1)","fromName":"Tony Finch","fromEmail":"dot@dotat.at","sentAt":"2015-07-22T10:05:04Z","receivedAt":"2015-07-22T10:05:04Z","isPatch":false,"sender":{"key":"dot@dotat.at","avatar":"https://avatars.githubusercontent.com/u/68429?v=4"},"body":"Jakub Narębski <jnareb@gmail.com> wrote:\n>\n\nThanks for the review!\n\n> > * tf/gitweb-project-listing (2015-03-19) 5 commits\n> >  - gitweb: make category headings into links when they are directories\n> >  - gitweb: optionally set project category from its pathname\n> >  - gitweb: add a link under the search box to clear a project filter\n> >  - gitweb: if the PATH_INFO is incomplete, use it as a project_filter\n> >\n> >  Update gitweb to make it more pleasant to deal with a hierarchical\n> >  forest of repositories.\n\nBy the way, you can see this patch series in action at\nhttps://git.csx.cam.ac.uk/x/ucs/\n\n> Second one, \"gitweb: if the PATH_INFO is incomplete, use it as a\n> project_filter\" looks interesting and quite useful. Though it doesn't\n> do much: it allows for handcrafted URL, and provides mechanism to\n> create breadcrumbs. It doesn't use this feature in its output...\n> Well, I think it doesn't: I cannot check it at this moment.\n\nHmm, I think this means I need a better commit message.\n\nThis patch fixes the ugly query-parameter URLs in the breadcrumbs that\nyou get even in path-info mode. Have a look at the breadcrumbs on the\nfollowing pages:\n\nhttps://git.csx.cam.ac.uk/g/ucs/git/git.git (unpatched)\nhttps://git.csx.cam.ac.uk/x/ucs/git/git.git (patched)\n\nIf you click on the antepenultimate /git/ in the breadcumbs you get query\nparameters without the patch and path_info with the patch. With the patch\nthe breadcrumbs match the URL.\n\n> What is missing is a support for query parameters path, and not only\n> path info.\n\nQuery parameter support is already present, in the form of project\nfilters.\n\n> Thought some thought is needed for generating (or not) breadcrumbs\n> if path_info is turned off.\n\nThat already works in unpatched gitweb.\n\n> The third, \"gitweb: add a link under the search box to clear a project\n> filter\" notices a problem... then solves it in strange way. IMVHO\n> a better solution would be to add \"List all projects\" URL together\n> with \" / \" (or other separator) conditionally, if $project_filter\n> is set. Or have \"List all projects\" and add \"List projects$limit\"\n> if $project_filter is set.\n\nYes, that is exactly what the patch does. I used a suffix \"if\" to align\nthe print statements and markup:\n+           if $project_filter;\n\nCompare and contrast the search box on these pages:\n\nhttps://git.csx.cam.ac.uk/g/ucs/?a=project_list;pf=u/fanf2\nhttps://git.csx.cam.ac.uk/x/ucs/u/fanf2/\n\nPerhaps you would prefer the following?\n\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -5549,10 +5549,14 @@ sub git_project_search_form {\n              \"</span>\\n\" .\n              $cgi->submit(-name => 'btnS', -value => 'Search') .\n              $cgi->end_form() . \"\\n\" .\n-             $cgi->a({-href => href(project => undef, searchtext => undef,\n-                                    project_filter => $project_filter)},\n-                     esc_html(\"List all projects$limit\")) . \"<br />\\n\";\n-       print \"</div>\\n\";\n+             $cgi->a({-href => $my_uri}, esc_html(\"List all projects\"));\n+       if ($project_filter) {\n+               print \" / \" .\n+                   $cgi->a({-href => href(project => undef, action => \"project_list\",\n+                                          project_filter => $project_filter)},\n+                           esc_html(\"List projects$limit\"));\n+       }\n+       print \"<br />\\n</div>\\n\";\n }\n\n # entry for given @keys needs filling if at least one of keys in list\n\n> The last two, which form the crux of this patch series, looks like\n> a good idea, though not without a few caveats. I am talking here\n> only about conceptual level, not about how it is coded (which has\n> few issues as well):\n>\n> - I think that non-bare repositories \"repo/.git\" should be\n>   treated as one directory entry, i.e. gitweb should not create\n>   a separate category for \"repo/\".  This is admittedly a corner\n>   case, but useful for git-instaweb\n\nYes, that's a bug, thanks for spotting it!\n\n> - I think that people would want to be able to configure how\n>   many levels of directory hierarchy gets turned into categories.\n>   Perhaps only top level should be turned into category? Deep\n>   hierarchies means deep categories (usually with very few\n>   repositories) with current implementation.\n\nGood question. I was assuming flat-ish directory hierarchies, but that's\nclearly not very true, e.g. https://git.kernel.org/cgit/\n\nI think it would be right to make this a %feature since categories already\nnearly fit the %feature per-project override style.\n\nI will send a new version of the series shortly.\n\nTony.\n-- \nf.anthony.n.finch  <dot@dotat.at>  http://dotat.at/\nViking, North Utsire: Westerly 4 or 5, occasionally 6 at first, backing\nsoutherly 3 or 4. Moderate becoming slight. Occasional rain in north. Good,\noccasionally moderate."},{"id":"266605","messageId":"55AF7B9C.4000108@gmail.com","threadId":"39763","inReplyTo":"alpine.LSU.2.00.1507220957350.16350@hermes-1.csi.cam.ac.uk","subject":"Re: What's cooking in git.git (Jul 2015, #01; Wed, 1)","fromName":"Jakub Narębski","fromEmail":"jnareb@gmail.com","sentAt":"2015-07-22T11:16:44Z","receivedAt":"2015-07-22T11:16:44Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On 2015-07-22, Tony Finch wrote:\n> Jakub Narębski <jnareb@gmail.com> wrote:\n> \n> Thanks for the review!\n> \n>>> * tf/gitweb-project-listing (2015-03-19) 5 commits\n>>>  - gitweb: make category headings into links when they are directories\n>>>  - gitweb: optionally set project category from its pathname\n>>>  - gitweb: add a link under the search box to clear a project filter\n>>>  - gitweb: if the PATH_INFO is incomplete, use it as a project_filter\n>>>\n>>>  Update gitweb to make it more pleasant to deal with a hierarchical\n>>>  forest of repositories.\n> \n> By the way, you can see this patch series in action at\n> https://git.csx.cam.ac.uk/x/ucs/\n\nThanks. I don't have my computer set up completely yet (after reinstall).\n\n>> Second one, \"gitweb: if the PATH_INFO is incomplete, use it as a\n>> project_filter\" looks interesting and quite useful. Though it doesn't\n>> do much: it allows for handcrafted URL, and provides mechanism to\n>> create breadcrumbs. It doesn't use this feature in its output...\n>> Well, I think it doesn't: I cannot check it at this moment.\n> \n> Hmm, I think this means I need a better commit message.\n> \n> This patch fixes the ugly query-parameter URLs in the breadcrumbs that\n> you get even in path-info mode. Have a look at the breadcrumbs on the\n> following pages:\n> \n> https://git.csx.cam.ac.uk/g/ucs/git/git.git (unpatched)\n> https://git.csx.cam.ac.uk/x/ucs/git/git.git (patched)\n> \n> If you click on the antepenultimate /git/ in the breadcumbs you get query\n> parameters without the patch and path_info with the patch. With the patch\n> the breadcrumbs match the URL.\n\nAh. Yes, the patch itself looks all right, but it definitely needs\na better (or at least enhanced) commit message if it is about *adding*\npath info counterpart to existing query parameter project_filter -\n- it is (also) about uniquifying URLs used in breadcrumbs when gitweb\nuses path info links.\n\nCurrent version is (if I have it correctly):\n\n    gitweb: if the PATH_INFO is incomplete, use it as a project_filter\n\n    Previously gitweb would ignore partial PATH_INFO. For example,\n    it would produce a project list for the top URL\n        https://www.example.org/projects/\n    and a project summary for\n        https://www.example.org/projects/git/git.git\n    but if you tried to list just the git-related projects with\n        https://www.example.org/projects/git/\n    you would get a list of all projects, same as the top URL.\n\n    As well as fixing that omission, this change also makes gitweb\n    generate PATH_INFO-style URLs for project filter links, such\n    as in the breadcrumbs.\n\nA question about implementation: why emptying $path_info in\nevaluate_path_info()?\n\n>> What is missing is a support for query parameters path, and not only\n>> path info.\n> \n> Query parameter support is already present, in the form of project\n> filters.\n> \n>> Thought some thought is needed for generating (or not) breadcrumbs\n>> if path_info is turned off.\n> \n> That already works in unpatched gitweb.\n\nRight.\n\n>> The third, \"gitweb: add a link under the search box to clear a project\n>> filter\" notices a problem... then solves it in strange way. IMVHO\n>> a better solution would be to add \"List all projects\" URL together\n>> with \" / \" (or other separator) conditionally, if $project_filter\n>> is set. Or have \"List all projects\" and add \"List projects$limit\"\n>> if $project_filter is set.\n> \n> Yes, that is exactly what the patch does. I used a suffix \"if\" to align\n> the print statements and markup:\n> +           if $project_filter;\n> \n> Compare and contrast the search box on these pages:\n> \n> https://git.csx.cam.ac.uk/g/ucs/?a=project_list;pf=u/fanf2\n> https://git.csx.cam.ac.uk/x/ucs/u/fanf2/\n> \n> Perhaps you would prefer the following?\n> \n> --- a/gitweb/gitweb.perl\n> +++ b/gitweb/gitweb.perl\n> @@ -5549,10 +5549,14 @@ sub git_project_search_form {\n>               \"</span>\\n\" .\n>               $cgi->submit(-name => 'btnS', -value => 'Search') .\n>               $cgi->end_form() . \"\\n\" .\n> -             $cgi->a({-href => href(project => undef, searchtext => undef,\n> -                                    project_filter => $project_filter)},\n> -                     esc_html(\"List all projects$limit\")) . \"<br />\\n\";\n> -       print \"</div>\\n\";\n> +             $cgi->a({-href => $my_uri}, esc_html(\"List all projects\"));\n> +       if ($project_filter) {\n> +               print \" / \" .\n> +                   $cgi->a({-href => href(project => undef, action => \"project_list\",\n> +                                          project_filter => $project_filter)},\n> +                           esc_html(\"List projects$limit\"));\n> +       }\n> +       print \"<br />\\n</div>\\n\";\n>  }\n> \n>  # entry for given @keys needs filling if at least one of keys in list\n\nYes, it is eminently more readable. \n\nPostfix controls are discouraged, especially with multi-line constructs\nc.f. Perl::Critic::Policy::ControlStructures::ProhibitPostfixControls\n\n>> The last two, which form the crux of this patch series, looks like\n>> a good idea, though not without a few caveats. I am talking here\n>> only about conceptual level, not about how it is coded (which has\n>> few issues as well):\n>>\n>> - I think that non-bare repositories \"repo/.git\" should be\n>>   treated as one directory entry, i.e. gitweb should not create\n>>   a separate category for \"repo/\".  This is admittedly a corner\n>>   case, but useful for git-instaweb\n> \n> Yes, that's a bug, thanks for spotting it!\n\nWell, more like a corner case. With \"repo/.git\" there wouldn't be\nother repositories in \"repo/\"... well, except for old-style submodules\nfor git-instaweb.\n \n>> - I think that people would want to be able to configure how\n>>   many levels of directory hierarchy gets turned into categories.\n>>   Perhaps only top level should be turned into category? Deep\n>>   hierarchies means deep categories (usually with very few\n>>   repositories) with current implementation.\n> \n> Good question. I was assuming flat-ish directory hierarchies, but that's\n> clearly not very true, e.g. https://git.kernel.org/cgit/\n> \n> I think it would be right to make this a %feature since categories already\n> nearly fit the %feature per-project override style.\n\nOn the other hand $projects_list_group_categories is a global gitweb\nconfiguration variable, and $projects_list_directory_is_category was\npatterned after it.\n\nNote that cgit, when using first part of path (first directory) as\nproject category, it strips it from project name, but indents project\nlist... though I am not sure if it would work if more than first\ndirectory is used for category (as in this case there can be repos\nmixed with categories: \"sub/repo.git\", \"sub/foo/bar.git\", \"sub/foo/baz.git\")\n\n> I will send a new version of the series shortly.\n\nA few thoughts about implementation:\n- the comment above $projects_list_directory_is_category does not\n  mention that it needs $projects_list_group_categories to function\n- $project_list_default_category is moved to inside of\n  git_get_project_category(), which is not mentioned in commit message\n  (and might be good independent cleanup)\n- with more complicated rules it would be worth moving the core of\n  work into newly created git_get_category_from_path(), or something\n  like that\n- can we turn category header into link even if the category didn't\n  came from $projects_list_directory_is_category?\n- even if $projects_list_directory_is_category is true, the category\n  could came from 'category' file, or otherwise manually set category,\n  though I wonder how we can easily detect this...\n\nBest regards\n-- \nJakub Narębski\n"},{"id":"266608","messageId":"alpine.LSU.2.00.1507221351420.12758@hermes-1.csi.cam.ac.uk","threadId":"39763","inReplyTo":"55AF7B9C.4000108@gmail.com","subject":"Re: What's cooking in git.git (Jul 2015, #01; Wed, 1)","fromName":"Tony Finch","fromEmail":"dot@dotat.at","sentAt":"2015-07-22T13:19:40Z","receivedAt":"2015-07-22T13:19:40Z","isPatch":false,"sender":{"key":"dot@dotat.at","avatar":"https://avatars.githubusercontent.com/u/68429?v=4"},"body":"Jakub Narębski <jnareb@gmail.com> wrote:\n>\n> A question about implementation: why emptying $path_info in\n> evaluate_path_info()?\n\nThat was for consistency with other parts of the subroutine which (mostly)\nremove items from the global $path_info variable when they are added to\n%input_params. But since $path_info isn't used after it has been parsed, I\nsuppose it is redundant.\n\n> >> - I think that people would want to be able to configure how\n> >>   many levels of directory hierarchy gets turned into categories.\n> >>   Perhaps only top level should be turned into category? Deep\n> >>   hierarchies means deep categories (usually with very few\n> >>   repositories) with current implementation.\n> >\n> > Good question. I was assuming flat-ish directory hierarchies, but that's\n> > clearly not very true, e.g. https://git.kernel.org/cgit/\n> >\n> > I think it would be right to make this a %feature since categories already\n> > nearly fit the %feature per-project override style.\n>\n> On the other hand $projects_list_group_categories is a global gitweb\n> configuration variable, and $projects_list_directory_is_category was\n> patterned after it.\n\nYes... Which do you prefer? :-)\n\n> A few thoughts about implementation:\n\nHelpful, thanks!\n\n> - can we turn category header into link even if the category didn't\n>   came from $projects_list_directory_is_category?\n\nThat would mean changing the project filter to match categories as well as\npaths. I don't know if this is the right thing to do; perhaps it is,\nbecause the current behaviour of my category headings is a bit surprising.\n\nAt the moment, clicking on the \"git\" category heading on the page linked\nbelow takes you to a page that does not list all the repos that were under\nthe category heading on the main page.\n\nhttps://git.csx.cam.ac.uk/x/ucs/\n\n> - even if $projects_list_directory_is_category is true, the category\n>   could came from 'category' file, or otherwise manually set category,\n>   though I wonder how we can easily detect this...\n\nYes - I use this to list my personal/experimental repos alongside\nthe production repos.\n\nI'm not sure why gitweb would need to detect this or what it would do in\nresponse. At the moment it \"just works\", apart from the oddity with\ncategories vs project filters i described above.\n\nTony.\n-- \nf.anthony.n.finch  <dot@dotat.at>  http://dotat.at/\nViking, North Utsire: Westerly 4 or 5, occasionally 6 at first, backing\nsoutherly 3 or 4. Moderate becoming slight. Occasional rain in north. Good,\noccasionally moderate."},{"id":"266623","messageId":"55AFEFE0.9000606@gmail.com","threadId":"39763","inReplyTo":"alpine.LSU.2.00.1507221351420.12758@hermes-1.csi.cam.ac.uk","subject":"Re: What's cooking in git.git (Jul 2015, #01; Wed, 1)","fromName":"Jakub Narębski","fromEmail":"jnareb@gmail.com","sentAt":"2015-07-22T19:32:48Z","receivedAt":"2015-07-22T19:32:48Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"W dniu 2015-07-22 o 15:19, Tony Finch pisze:\n> Jakub Narębski <jnareb@gmail.com> wrote:\n>>\n>> A question about implementation: why emptying $path_info in\n>> evaluate_path_info()?\n> \n> That was for consistency with other parts of the subroutine which (mostly)\n> remove items from the global $path_info variable when they are added to\n> %input_params. But since $path_info isn't used after it has been parsed, I\n> suppose it is redundant.\n\nIf it is for consistency, better leave it in my opinion.\n\n>>>> - I think that people would want to be able to configure how\n>>>>   many levels of directory hierarchy gets turned into categories.\n>>>>   Perhaps only top level should be turned into category? Deep\n>>>>   hierarchies means deep categories (usually with very few\n>>>>   repositories) with current implementation.\n>>>\n>>> Good question. I was assuming flat-ish directory hierarchies, but that's\n>>> clearly not very true, e.g. https://git.kernel.org/cgit/\n>>>\n>>> I think it would be right to make this a %feature since categories already\n>>> nearly fit the %feature per-project override style.\n>>\n>> On the other hand $projects_list_group_categories is a global gitweb\n>> configuration variable, and $projects_list_directory_is_category was\n>> patterned after it.\n> \n> Yes... Which do you prefer? :-)\n\nHmmm... does it makes sense to have per-repository override?  If yes,\nthen we need to use %features. If not... I am not sure, %features is\nnewer than global (or rather package) variables for gitweb configuration,\nwhich must be left for legacy config support (and few are needed before\n%features are parsed).\n\n>> A few thoughts about implementation:\n> \n> Helpful, thanks!\n> \n>> - can we turn category header into link even if the category didn't\n>>   came from $projects_list_directory_is_category?\n> \n> That would mean changing the project filter to match categories as well as\n> paths. I don't know if this is the right thing to do; perhaps it is,\n> because the current behaviour of my category headings is a bit surprising.\n> \n> At the moment, clicking on the \"git\" category heading on the page linked\n> below takes you to a page that does not list all the repos that were under\n> the category heading on the main page.\n> \n> https://git.csx.cam.ac.uk/x/ucs/\n\nI thought gitweb had a way to list all projects belonging to given category,\nbut I see that it doesn't.  So you need to find out if 'category' came from\ncategory or from pathname, to decide whether to link it using 'projects_list'\naction and 'project_filter' parameter (or their PATH_INFO version), or not.\n\nThis can be done either by checking that category name is directory (though\nwe could have false positives here), or when adding categories denote where\nit came from (e.g. with additional field).  I think the second is better,\nif we are to hyperlink category-from-pathname headings.\n\nThere is interesting corner case: what if some projects use category, and\nsome have the same category from pathname?  Clicking on category if \nhyper-linked would show only a subset of projects inside category. (I think\nthis is the oddity you noticed.)\n\n>> - even if $projects_list_directory_is_category is true, the category\n>>   could came from 'category' file, or otherwise manually set category,\n>>   though I wonder how we can easily detect this...\n> \n> Yes - I use this to list my personal/experimental repos alongside\n> the production repos.\n> \n> I'm not sure why gitweb would need to detect this or what it would do in\n> response. At the moment it \"just works\", apart from the oddity with\n> categories vs project filters i described above.\n\nWhat if there is synthetic category that has no representative in the\npath hierarchy?  Then \"project_filter\" link would lead to strange empty\nlist of projects...\n\nFor example http://git.zx2c4.com/ (cgit) uses \"Mirrors\" category...\n\nWe could either abuse \"project_filter\" for categories, or add a new\nquery parameter \"project_category\" or \"cat\" in short. In either case\nit would not have PATH_INFO URL unless category came from directory.\n\nFood for thought\n-- \nJakub Narębski\n"},{"id":"266635","messageId":"alpine.LSU.2.00.1507222211300.24176@hermes-1.csi.cam.ac.uk","threadId":"39763","inReplyTo":"55AFEFE0.9000606@gmail.com","subject":"Re: What's cooking in git.git (Jul 2015, #01; Wed, 1)","fromName":"Tony Finch","fromEmail":"dot@dotat.at","sentAt":"2015-07-22T21:14:14Z","receivedAt":"2015-07-22T21:14:14Z","isPatch":false,"sender":{"key":"dot@dotat.at","avatar":"https://avatars.githubusercontent.com/u/68429?v=4"},"body":"Jakub Narębski <jnareb@gmail.com> wrote:\n>\n> Food for thought\n\nYes, very helpful, thanks. I got mobbed by other things today so I won't\nbe able to get back to this until next week.\n\nTony (off for a few days holiday).\n-- \nf.anthony.n.finch  <dot@dotat.at>  http://dotat.at/\nLundy, Fastnet, Irish Sea, Shannon: West or southwest, veering north later in\nShannon and Fastnet, 4 or 5. Slight or moderate, occasionally rough at first\nin north Shannon. Rain or showers. Good, occasionally poor."}]}