{"thread":{"id":"35673","subject":"What's cooking in git.git (Jan 2014, #03; Thu, 16)","startedAt":"2014-01-16T21:03:40Z","lastAt":"2014-01-30T22:20:45Z","messageCount":20,"participants":["Junio C Hamano","Javier Domingo Cansino","Stefan Näwe","Vicent Martí","Ken Moffat","Jeff King","Kacper Kornet","Jonathan Nieder","Sitaram Chamarty"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"233224","messageId":"xmqq61pjzljn.fsf@gitster.dls.corp.google.com","threadId":"35673","inReplyTo":null,"subject":"What's cooking in git.git (Jan 2014, #03; Thu, 16)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-01-16T21:03:40Z","receivedAt":"2014-01-16T21:03:40Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here 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\nI am planning to tag 1.9-rc0 preview release from the tip of\n'master' soonish. Hopefully a few fix-up topics still in flight and\nalso updates to git-gui, gitk, git-svn, i18n, etc. from respective\narea maintainers can be merged by the time 1.9-rc1 will be tagged.\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* br/sha1-name-40-hex-no-disambiguation (2014-01-07) 1 commit\n (merged to 'next' on 2014-01-10 at 2a0973b)\n + sha1_name: don't resolve refs when core.warnambiguousrefs is false\n (this branch is used by jk/warn-on-object-refname-ambiguity.)\n\n When parsing a 40-hex string into the object name, the string is\n checked to see if it can be interpreted as a ref so that a warning\n can be given for ambiguity. The code kicked in even when the\n core.warnambiguousrefs is set to false to squelch this warning, in\n which case the cycles spent to look at the ref namespace were an\n expensive no-op, as the result was discarded without being used.\n\n\n* jk/pull-rebase-using-fork-point (2014-01-09) 1 commit\n (merged to 'next' on 2014-01-10 at e86e59d)\n + rebase: fix fork-point with zero arguments\n\n\n* jl/submodule-mv-checkout-caveat (2014-01-07) 2 commits\n (merged to 'next' on 2014-01-10 at 8d3953c)\n + rm: better document side effects when removing a submodule\n + mv: better document side effects when moving a submodule\n\n With a submodule that was initialized in an old fashioned way\n without gitlinks, switching branches in the superproject between\n the one with and without the submodule may leave the submodule\n working tree with its embedded repository behind, as there may be\n unexpendable state there. Document and warn users about this.\n\n\n* jn/pager-lv-default-env (2014-01-07) 1 commit\n (merged to 'next' on 2014-01-10 at 22d4755)\n + pager: set LV=-c alongside LESS=FRSX\n\n Just like we give a reasonable default for \"less\" via the LESS\n environment variable, specify a reasonable default for \"lv\" via the\n \"LV\" environment variable when spawning the pager.\n\n\n* mh/shorten-unambigous-ref (2014-01-09) 3 commits\n + shorten_unambiguous_ref(): tighten up pointer arithmetic\n + gen_scanf_fmt(): delete function and use snprintf() instead\n + shorten_unambiguous_ref(): introduce a new local variable\n\n\n* mm/mv-file-to-no-such-dir-with-slash (2014-01-10) 1 commit\n + mv: let 'git mv file no-such-dir/' error out on Windows, too\n\n Finishing touches to a topic that has already been merged to 'master'.\n\n\n* ow/stash-with-ifs (2014-01-07) 1 commit\n (merged to 'next' on 2014-01-10 at 4fc9bdb)\n + stash: handle specifying stashes with $IFS\n\n The implementation of 'git stash $cmd \"stash@{...}\"' did not quote\n the stash argument properly and left it split at IFS whitespace.\n\n\n* rr/completion-format-coverletter (2014-01-07) 1 commit\n (merged to 'next' on 2014-01-10 at d2dbc9d)\n + completion: complete format.coverLetter\n\n The bash/zsh completion code did not know about format.coverLetter\n among many format.* configuration variables.\n\n--------------------------------------------------\n[New Topics]\n\n* ab/subtree-doc (2014-01-13) 1 commit\n - subtree: fix argument validation in add/pull/push\n\n Will merge to 'next'.\n\n\n* jk/complete-merge-base (2014-01-13) 2 commits\n - completion: handle --[no-]fork-point options to git-rebase\n - completion: complete merge-base options\n\n Will merge to 'next'.\n\n\n* po/everyday-doc (2014-01-13) 1 commit\n - Make 'git help everyday' work\n\n\n* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits\n - merge: drop unused arg from abort_commit method signature\n - merge: make prepare_to_commit responsible for write_merge_state\n - t7505: ensure cleanup after hook blocks merge\n - t7505: add missing &&\n\n Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that\n run during \"git merge\". The log stressed too much on one hook,\n prepare-commit-msg, but it would equally apply to other hooks like\n post-merge, I think.\n\n Waiting to give a chance to reroll.\n\n\n* bl/blame-full-history (2014-01-14) 1 commit\n - blame: new option --prefer-first to better handle merged cherry-picks\n\n\n* da/pull-ff-configuration (2014-01-15) 2 commits\n - pull: add --ff-only to the help text\n - pull: add pull.ff configuration\n\n Will merge to 'next'.\n\n\n* jc/maint-pull-docfix (2014-01-14) 2 commits\n - Documentation: \"git pull\" does not have the \"-m\" option\n - Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix\n (this branch uses jc/maint-pull-docfix-for-409b8d82.)\n\n Will merge to 'next'.\n\n\n* jc/maint-pull-docfix-for-409b8d82 (2014-01-14) 1 commit\n - Documentation: exclude irrelevant options from \"git pull\"\n (this branch is used by jc/maint-pull-docfix.)\n\n Will merge to 'next'.\n\n\n* jc/revision-range-unpeel (2014-01-15) 2 commits\n - revision: propagate flag bits from tags to pointees\n - revision: mark contents of an uninteresting tree uninteresting\n\n \"git log --left-right A...B\" lost the \"leftness\" of commits\n reachable from A when A is a tag as a side effect of a recent\n bugfix. This is a regression in 1.8.4.x series.\n\n Will merge to 'next'.\n\n\n* jk/allow-fetch-onelevel-refname (2014-01-15) 1 commit\n - fetch-pack: do not filter out one-level refs\n\n \"git clone\" would fail to clone from a repository that has a ref\n directly under \"refs/\", e.g. \"refs/stash\", because different\n validation paths do different things on such a refname. Loosen the\n client side's validation to allow such a ref.\n\n Will merge to 'next'.\n\n\n* jk/interpret-branch-name-fix (2014-01-15) 5 commits\n - interpret_branch_name: find all possible @-marks\n - interpret_branch_name: avoid @{upstream} past colon\n - interpret_branch_name: always respect \"namelen\" parameter\n - interpret_branch_name: rename \"cp\" variable to \"at\"\n - interpret_branch_name: factor out upstream handling\n\n Fix a handful of bugs around interpreting $branch@{upstream}\n notation and its lookalike, when $branch part has interesting\n characters, e.g. \"@\", and \":\".\n\n Will merge to 'next'.\n\n\n* mh/attr-macro-doc (2014-01-14) 1 commit\n - gitattributes: document more clearly where macros are allowed\n\n Will merge to 'next'.\n\n\n* mh/retire-ref-fetch-rules (2014-01-14) 1 commit\n - refname_match(): always use the rules in ref_rev_parse_rules\n\n Code simplification.\n\n Will merge to 'next'.\n\n--------------------------------------------------\n[Stalled]\n\n* jc/graph-post-root-gap (2013-12-30) 3 commits\n - WIP: document what we want at the end\n - graph: remove unused code a bit\n - graph: stuff the current commit into graph->columns[]\n\n This was primarily a RFH ($gmane/239580).\n\n\n* fc/transport-helper-fixes (2013-12-09) 6 commits\n - remote-bzr: support the new 'force' option\n - test-hg.sh: tests are now expected to pass\n - transport-helper: check for 'forced update' message\n - transport-helper: add 'force' to 'export' helpers\n - transport-helper: don't update refs in dry-run\n - transport-helper: mismerge fix\n\n Updates transport-helper, fast-import and fast-export to allow the\n ref mapping and ref deletion in a way similar to the natively\n supported transports.\n\n Reported to break t5541.\n Will hold.\n\n\n* fc/completion (2013-12-09) 1 commit\n - completion: fix completion of certain aliases\n\n SZEDER Gábor noticed that this breaks \"git -c var=val alias\" and\n also suggested a better description of the change.\n\n Will hold.\n\n\n* mo/subtree-split-updates (2013-12-10) 3 commits\n - subtree: add --edit option\n - subtree: allow --squash and --message with push\n - subtree: support split --rejoin --squash\n\n Comments?\n\n\n* hv/submodule-ignore-fix (2013-12-06) 4 commits\n - disable complete ignorance of submodules for index <-> HEAD diff\n - always show committed submodules in summary after commit\n - teach add -f option for ignored submodules\n - fix 'git add' to skip submodules configured as ignored\n\n Teach \"git add\" to be consistent with \"git status\" when changes to\n submodules are set to be ignored, to avoid surprises after checking\n with \"git status\" to see there isn't any change to be further added\n and then see that \"git add .\" adds changes to them.\n\n I think a reroll is coming, so this may need to be replaced, but I\n needed some practice with heavy conflict resolution. It conflicts\n with two changes to \"git add\" that have been scheduled for Git 2.0\n quite badly, and I think I got the resolution right this time.\n\n\n* kb/fast-hashmap (2014-01-03) 19 commits\n - hashmap.h: make sure map entries are tightly packed\n (merged to 'next' on 2014-01-03 at dc85001)\n + name-hash: retire unused index_name_exists()\n + hashmap.h: Use 'unsigned int' for hash-codes everywhere\n (merged to 'next' on 2013-12-16 at bff99b1)\n + Drop unnecessary #includes from test-hashmap\n + Add test-hashmap to .gitignore\n (merged to 'next' on 2013-12-06 at f90be3d)\n + read-cache.c: fix memory leaks caused by removed cache entries\n + builtin/update-index.c: cleanup update_one\n + fix 'git update-index --verbose --again' output\n + remove old hash.[ch] implementation\n + name-hash.c: remove cache entries instead of marking them CE_UNHASHED\n + name-hash.c: use new hash map implementation for cache entries\n + name-hash.c: remove unreferenced directory entries\n + name-hash.c: use new hash map implementation for directories\n + diffcore-rename.c: use new hash map implementation\n + diffcore-rename.c: simplify finding exact renames\n + diffcore-rename.c: move code around to prepare for the next patch\n + buitin/describe.c: use new hash map implementation\n + add a hashtable implementation that supports O(1) removal\n + submodule: don't access the .gitmodules cache entry after removing it\n\n Improvements to our hash table to get it to meet the needs of the\n msysgit fscache project, with some nice performance improvements.\n\n The tip one does not seem to have reached concensus (yet).\n\n\n* jc/create-directories-microopt (2013-11-11) 1 commit\n - checkout: most of the time we have good leading directories\n\n Of unknown value until tested on non-Linux platforms (especially\n Windows).\n\n Will hold.\n\n\n* jt/commit-fixes-footer (2013-10-30) 1 commit\n - commit: Add -f, --fixes option to add Fixes: line\n\n There is an ongoing discussion around this topic; in general I am\n fairly negative on a new feature that is too narrow and prefer a\n more generic solution that can be tailored for specific needs, as\n many people stated in the thread.\n\n It appears that the discussion stalled.\n\n\n* np/pack-v4 (2013-09-18) 90 commits\n . packv4-parse.c: add tree offset caching\n . t1050: replace one instance of show-index with verify-pack\n . index-pack, pack-objects: allow creating .idx v2 with .pack v4\n . unpack-objects: decode v4 trees\n . unpack-objects: allow to save processed bytes to a buffer\n - ...\n\n Nico and Duy advancing the eternal vaporware pack-v4. This is here\n primarily for wider distribution of the preview edition.\n\n Temporarily ejected from 'pu', to try out jk/pack-bitmap, which\n this topic conflicts with.\n\n\n* mf/graph-show-root (2013-10-25) 1 commit\n . graph.c: mark root commit differently\n\n In a repository with multiple-roots, \"log --graph\", especially with\n \"--oneline\", does not give the reader enough visual cue to see\n where one line of history ended and a separate history began.\n\n This is the version that marks the roots 'x' when they would have\n been marked as '*'; Keshav Kini suggested an alternative of giving\n an extra blank line after every root, which I tend to think is a\n better approach to the problem.\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 Holding until needed.\n\n\n* yt/shortened-rename (2013-10-18) 2 commits\n - SQUASH??? style fixes and s/omit/shorten/ where appropriate\n - diff.c: keep arrow(=>) on show_stats()'s shortened filename part to make rename visible\n\n Attempts to give more weight on the fact that a filepair represents\n a rename than showing substring of the actual path when diffstat\n lines are not wide enough.\n\n I am not sure if that is solving a right problem, though.\n\n\n* rv/send-email-cache-generated-mid (2013-08-21) 2 commits\n - git-send-email: Cache generated message-ids, use them when prompting\n - git-send-email: add optional 'choices' parameter to the ask sub\n\n\n* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits\n - ### DONTMERGE: needs better explanation on what config they need\n - pack-refs.c: Add missing call to git_config()\n - show-ref.c: Add missing call to git_config()\n\n The changes themselves are probably good, but it is unclear what\n basic setting needs to be read for which exact operation.\n\n Waiting for clarification.\n $gmane/228294\n\n\n* jc/format-patch (2013-04-22) 2 commits\n - format-patch: --inline-single\n - format-patch: rename \"no_inline\" field\n\n A new option to send a single patch to the standard output to be\n appended at the bottom of a message. I personally have no need for\n this, but it was easy enough to cobble together. Tests, docs and\n stripping out more MIMEy stuff are left as exercises to interested\n parties.\n\n\n* jk/gitweb-utf8 (2013-04-08) 4 commits\n - gitweb: Fix broken blob action parameters on blob/commitdiff pages\n - gitweb: Don't append ';js=(0|1)' to external links\n - gitweb: Make feed title valid utf8\n - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch\n\n Various fixes to gitweb.\n\n Drew Northup volunteered to take a look into this.\n $gmane/226216\n\n\n* jc/show-branch (2013-06-07) 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 before sending it out.\n\n--------------------------------------------------\n[Cooking]\n\n* wk/submodule-on-branch (2014-01-16) 6 commits\n - Documentation: Describe 'submodule update' modes in detail\n - t7406: Add explicit tests for head attachement after cloning updates\n - [DONOTMERGE] t7406: Just-cloned checkouts update to the gitlinked hash with 'reset'\n - submodule: Explicit local branch creation in module_clone\n - submodule: Document module_clone arguments in comments\n - submodule: Make 'checkout' update_module explicit\n (this branch uses fp/submodule-checkout-mode.)\n\n Makes sure 'submodule update' modes that do not detach HEADs can\n be used more pleasantly by checking out a concrete branch when\n cloning them to prime the well.\n\n This round seems to be almost ready; further discussions are of\n course very much welcomed.\n\n Will wait for another reroll to fix minor nits, at least.\n\n\n* jk/branch-at-publish (2014-01-13) 6 commits\n - t1507 (rev-parse-upstream): fix typo in test title\n - implement @{publish} shorthand\n - branch_get: provide per-branch pushremote pointers\n - branch_get: return early on error\n - interpret_branch_name: factor out upstream handling\n - sha1_name: refactor upstream_mark\n\n Give an easier access to the tracking branches from \"other\" side in\n a triangular workflow by introducing B@{publish} that works in a\n similar way to how B@{upstream} does.\n\n Will rebase to share the same change with the\n jk/interpret-branch-name-fix topic.\n\n\n* jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits\n - get_sha1: drop object/refname ambiguity flag\n - get_sha1: speed up ambiguous 40-hex test\n - FIXUP: teach DO_FOR_EACH_NO_RECURSE to prime_ref_dir()\n - refs: teach for_each_ref a flag to avoid recursion\n - cat-file: fix a minor memory leak in batch_objects\n - cat-file: refactor error handling of batch_objects\n\n Expecting a reroll.\n\n\n* ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit\n - remote-hg: do not fail on invalid bookmarks\n\n Reported to break tests ($gmane/240005)\n Expecting a reroll.\n\n\n* ss/safe-create-leading-dir-with-slash (2014-01-06) 1 commit\n - safe_create_leading_directories(): on Windows, \\ can separate path components\n\n Expecting to be rolled into mh/safe-create-leading-directories\n\n\n* fp/submodule-checkout-mode (2014-01-07) 1 commit\n (merged to 'next' on 2014-01-10 at 647ba9b)\n + git-submodule.sh: 'checkout' is a valid update mode\n (this branch is used by wk/submodule-on-branch.)\n\n \"submodule.*.update=checkout\", when propagated from .gitmodules to\n .git/config, turned into a \"submodule.*.update=none\", which did not\n make much sense.\n\n Will merge to 'master'.\n\n\n* jl/submodule-recursive-checkout (2013-12-26) 5 commits\n - Teach checkout to recursively checkout submodules\n - submodule: teach unpack_trees() to update submodules\n - submodule: teach unpack_trees() to repopulate submodules\n - submodule: teach unpack_trees() to remove submodule contents\n - submodule: prepare for recursive checkout of submodules\n\n Expecting a reroll.\n\n\n* mh/safe-create-leading-directories (2014-01-06) 17 commits\n - rename_tmp_log(): on SCLD_VANISHED, retry\n - rename_tmp_log(): limit the number of remote_empty_directories() attempts\n - rename_tmp_log(): handle a possible mkdir/rmdir race\n - rename_ref(): extract function rename_tmp_log()\n - remove_dir_recurse(): handle disappearing files and directories\n - remove_dir_recurse(): tighten condition for removing unreadable dir\n - lock_ref_sha1_basic(): if locking fails with ENOENT, retry\n - lock_ref_sha1_basic(): on SCLD_VANISHED, retry\n - safe_create_leading_directories(): add new error value SCLD_VANISHED\n - cmd_init_db(): when creating directories, handle errors conservatively\n - safe_create_leading_directories(): introduce enum for return values\n - safe_create_leading_directories(): always restore slash at end of loop\n - safe_create_leading_directories(): split on first of multiple slashes\n - safe_create_leading_directories(): rename local variable\n - safe_create_leading_directories(): add explicit \"slash\" pointer\n - safe_create_leading_directories(): reduce scope of local variable\n - safe_create_leading_directories(): fix format of \"if\" chaining\n\n Code clean-up and protection against concurrent write access to the\n ref namespace.\n\n Asked Michael and Sebastian to work together to roll the latter's\n \"allow passing p\\a\\t\\h to safe_create_leading_dir()\" into this.\n\n Expecting a reroll.\n\n\n* jk/pack-bitmap (2013-12-30) 21 commits\n (merged to 'next' on 2014-01-10 at bdbe0a4)\n + pack-bitmap: implement optional name_hash cache\n + t/perf: add tests for pack bitmaps\n + t: add basic bitmap functionality tests\n + count-objects: recognize .bitmap in garbage-checking\n + repack: consider bitmaps when performing repacks\n + repack: handle optional files created by pack-objects\n + repack: turn exts array into array-of-struct\n + repack: stop using magic number for ARRAY_SIZE(exts)\n + pack-objects: implement bitmap writing\n + rev-list: add bitmap mode to speed up object lists\n + pack-objects: use bitmaps when packing objects\n + pack-objects: split add_object_entry\n + pack-bitmap: add support for bitmap indexes\n + documentation: add documentation for the bitmap format\n + ewah: compressed bitmap implementation\n + compat: add endianness helpers\n + sha1_file: export `git_open_noatime`\n + revision: allow setting custom limiter function\n + pack-objects: factor out name_hash\n + pack-objects: refactor the packing list\n + revindex: export new APIs\n\n Borrows the bitmap index into packfiles from JGit to speed up\n enumeration of objects involved in a commit range without having to\n fully traverse the history.\n\n Will cook in 'next'.\n\n\n* nv/commit-gpgsign-config (2013-12-17) 3 commits\n (merged to 'next' on 2014-01-03 at 9780cbb)\n + test the commit.gpgsign config option\n + commit-tree: add and document --no-gpg-sign\n + Add the commit.gpgsign option to sign all commits\n\n Introduce commit.gpgsign configuration variable to force every\n commit to be GPG signed. The variable cannot be overriden from the\n command line of some of the commands that create commits except for\n \"git commit\" and \"git commit-tree\", but I am not convinced that it\n is a good idea to sprinkle support for --no-gpg-sign everywhere.\n\n Will cook in 'next'.\n\n\n* nd/shallow-clone (2014-01-09) 31 commits\n (merged to 'next' on 2014-01-09 at 6608634)\n + t5537: fix incorrect expectation in test case 10\n (merged to 'next' on 2014-01-06 at 3dc7fab)\n + shallow: remove unused code\n + send-pack.c: mark a file-local function static\n (merged to 'next' on 2014-01-03 at a776065)\n + git-clone.txt: remove shallow clone limitations\n + prune: clean .git/shallow after pruning objects\n + clone: use git protocol for cloning shallow repo locally\n + send-pack: support pushing from a shallow clone via http\n + receive-pack: support pushing to a shallow clone via http\n + smart-http: support shallow fetch/clone\n + remote-curl: pass ref SHA-1 to fetch-pack as well\n + send-pack: support pushing to a shallow clone\n + receive-pack: allow pushes that update .git/shallow\n + connected.c: add new variant that runs with --shallow-file\n + add GIT_SHALLOW_FILE to propagate --shallow-file to subprocesses\n + receive/send-pack: support pushing from a shallow clone\n + receive-pack: reorder some code in unpack()\n + fetch: add --update-shallow to accept refs that update .git/shallow\n + upload-pack: make sure deepening preserves shallow roots\n + fetch: support fetching from a shallow repository\n + clone: support remote shallow repository\n + fetch-pack.h: one statement per bitfield declaration\n + fetch-pack.c: move shallow update code out of fetch_pack()\n + shallow.c: steps 6 and 7 to select new commits for .git/shallow\n + shallow.c: the 8 steps to select new commits for .git/shallow\n + shallow.c: extend setup_*_shallow() to accept extra shallow commits\n + connect.c: teach get_remote_heads to parse \"shallow\" lines\n + make the sender advertise shallow commits to the receiver\n + clone: prevent --reference to a shallow repository\n + send-pack: forbid pushing from a shallow repository\n + remote.h: replace struct extra_have_objects with struct sha1_array\n + transport.h: remove send_pack prototype, already defined in send-pack.h\n\n Fetching from a shallow-cloned repository used to be forbidden,\n primarily because the codepaths involved were not carefully vetted\n and we did not bother supporting such usage. This attempts to allow\n object transfer out of a shallow-cloned repository in a controlled\n way (i.e. the receiver become a shallow repository with truncated\n history).\n\n Will merge to 'master'.\n\n\n* jn/git-gui-chmod+x (2013-11-25) 1 commit\n - git-gui: chmod +x po2msg, windows/git-gui.sh\n\n Parked here until I get the same change back from the upstream\n git-gui tree.\n\n\n* jn/gitk-chmod+x (2013-11-25) 1 commit\n - gitk: chmod +x po2msg\n\n Parked here until I get the same change back from the upstream gitk\n tree.\n\n\n* cc/starts-n-ends-with-endgame (2013-12-05) 1 commit\n (merged to 'next' on 2014-01-07 at 4cdf8d0)\n + strbuf: remove prefixcmp() and suffixcmp()\n\n Endgame for the cc/starts-n-ends-with topic; this needs to be\n evil-merged with other topics that introduce new uses of\n prefix/suffix-cmp functions.\n\n Will cook in 'next' until Git 2.0.\n\n\n* gj/push-more-verbose-advice (2013-11-13) 1 commit\n (merged to 'next' on 2013-12-06 at 574b18a)\n + push: switch default from \"matching\" to \"simple\"\n\n Originally merged to 'next' on 2013-11-21\n\n Explain 'simple' and 'matching' in \"git push\" advice message; the\n topmost patch is a rebase of jc/push-2.0-default-to-simple on top\n of it.\n\n Will cook in 'next' until Git 2.0.\n\n\n* tr/merge-recursive-index-only (2013-10-28) 3 commits\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 Will hold until using script appears.\n\n\n* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit\n (merged to 'next' on 2013-12-06 at ead2ec8)\n + git add: -u/-A now affects the entire working tree\n\n Will cook in 'next' until Git 2.0.\n\n\n* jc/core-checkstat-2.0 (2013-05-06) 1 commit\n (merged to 'next' on 2013-12-06 at ae18007)\n + core.statinfo: remove as promised in Git 2.0\n\n Will cook in 'next' until Git 2.0.\n\n\n* jc/push-2.0-default-to-simple (2013-06-18) 1 commit\n (merged to 'next' on 2013-12-06 at 6fad61c)\n + push: switch default from \"matching\" to \"simple\"\n\n Will cook in 'next' until Git 2.0.\n\n\n* jc/add-2.0-ignore-removal (2013-04-22) 1 commit\n (merged to 'next' on 2013-12-06 at fbaa75a)\n + git add ... defaults to \"-A\"\n\n Updated endgame for \"git add \" that defaults to \"--all\"\n aka \"--no-ignore-removal\".\n\n Will cook in 'next' until Git 2.0.\n\n\n* jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit\n (merged to 'next' on 2013-12-06 at 083d67c)\n + diff: remove \"diff-files -q\" in a version of Git in a distant future\n\n Will cook in 'next' until a distant future.\n"},{"id":"233466","messageId":"xmqqha8xt22p.fsf@gitster.dls.corp.google.com","threadId":"35673","inReplyTo":"xmqq61pjzljn.fsf@gitster.dls.corp.google.com","subject":"[ANNOUNCE] Git v1.9-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-01-21T22:14:22Z","receivedAt":"2014-01-21T22:14:22Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"An early preview release Git v1.9-rc0 is now available for testing\nat the usual places. I tagged this late last week, but forgot to\nsend out the announcement before I left for the weekend, and then I\nwasn't well yesterday, but anyway. There still may be a few minor\ntopics not in this preview but should be in the final release, but\notherwise, this should be pretty close to \"it\".\n\nIt has been reported that turning git.rc into git.res does not like\nthe new 2-dewey-decimal release numbering scheme; packagers of\nvarious distro might find similar issues in their build procedures,\nin which case they have about 3 weeks to update them until the final\nrelease.\n\nThe release tarballs are found at:\n\n http://code.google.com/p/git-core/downloads/list\n\nand their SHA-1 checksums are:\n\n495108620f8547ec8e979549857dae96bfabb0f7 git-1.9.rc0.tar.gz\ndaf964f46acd9ba72ebcdfbd1ef0c668206a0d92 git-htmldocs-1.9.rc0.tar.gz\na3b83356f738d1452bcee1d43ac5267a08986292 git-manpages-1.9.rc0.tar.gz\n\nThe following public repositories all have a copy of the v1.9-rc0\ntag and the v1.9-rc0 branch that the tag points at:\n\n url = https://kernel.googlesource.com/pub/scm/git/git\n url = git://repo.or.cz/alt-git.git\n url = https://code.google.com/p/git-core/\n url = git://git.sourceforge.jp/gitroot/git-core/git.git\n url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core\n url = https://github.com/gitster/git\n\nGit v1.9 Release Notes (draft)\n======================\n\nBackward compatibility notes\n----------------------------\n\n\"git submodule foreach $cmd $args\" used to treat \"$cmd $args\" the same\nway \"ssh\" did, concatenating them into a single string and letting the\nshell unquote. Careless users who forget to sufficiently quote $args\ngets their argument split at $IFS whitespaces by the shell, and got\nunexpected results due to this. Starting from this release, the\ncommand line is passed directly to the shell, if it has an argument.\n\nRead-only support for experimental loose-object format, in which users\ncould optionally choose to write in their loose objects for a short\nwhile between v1.4.3 to v1.5.3 era, has been dropped.\n\nThe meanings of \"--tags\" option to \"git fetch\" has changed; the\ncommand fetches tags _in addition to_ what are fetched by the same\ncommand line without the option.\n\nThe way \"git push $there $what\" interprets $what part given on the\ncommand line, when it does not have a colon that explicitly tells us\nwhat ref at the $there repository is to be updated, has been enhanced.\n\nA handful of ancient commands that have long been deprecated are\nfinally gone (repo-config, tar-tree, lost-found, and peek-remote).\n\n\nBackward compatibility notes (for Git 2.0)\n------------------------------------------\n\nWhen \"git push [$there]\" does not say what to push, we have used the\ntraditional \"matching\" semantics so far (all your branches were sent\nto the remote as long as there already are branches of the same name\nover there). In Git 2.0, the default will change to the \"simple\"\nsemantics, which pushes:\n\n - only the current branch to the branch with the same name, and only\n when the current branch is set to integrate with that remote\n branch, if you are pushing to the same remote as you fetch from; or\n\n - only the current branch to the branch with the same name, if you\n are pushing to a remote that is not where you usually fetch from.\n\nUse the user preference configuration variable \"push.default\" to\nchange this. If you are an old-timer who is used to the \"matching\"\nsemantics, you can set the variable to \"matching\" to keep the\ntraditional behaviour. If you want to live in the future early, you\ncan set it to \"simple\" today without waiting for Git 2.0.\n\nWhen \"git add -u\" (and \"git add -A\") is run inside a subdirectory and\ndoes not specify which paths to add on the command line, it\nwill operate on the entire tree in Git 2.0 for consistency\nwith \"git commit -a\" and other commands. There will be no\nmechanism to make plain \"git add -u\" behave like \"git add -u .\".\nCurrent users of \"git add -u\" (without a pathspec) should start\ntraining their fingers to explicitly say \"git add -u .\"\nbefore Git 2.0 comes. A warning is issued when these commands are\nrun without a pathspec and when you have local changes outside the\ncurrent directory, because the behaviour in Git 2.0 will be different\nfrom today's version in such a situation.\n\nIn Git 2.0, \"git add \" will behave as \"git add -A \", so\nthat \"git add dir/\" will notice paths you removed from the directory\nand record the removal. Versions before Git 2.0, including this\nrelease, will keep ignoring removals, but the users who rely on this\nbehaviour are encouraged to start using \"git add --ignore-removal \"\nnow before 2.0 is released.\n\nThe default prefix for \"git svn\" will change in Git 2.0. For a long\ntime, \"git svn\" created its remote-tracking branches directly under\nrefs/remotes, but it will place them under refs/remotes/origin/ unless\nit is told otherwise with its --prefix option.\n\n\nUpdates since v1.8.5\n--------------------\n\nForeign interfaces, subsystems and ports.\n\n * The HTTP transport, when talking GSS-Negotiate, uses \"100\n Continue\" response to avoid having to rewind and resend a large\n payload, which may not be always doable.\n\n * Various bugfixes to remote-bzr and remote-hg (in contrib/).\n\n * The build procedure is aware of MirBSD now.\n\n\nUI, Workflows & Features\n\n * Fetching from a shallowly-cloned repository used to be forbidden,\n primarily because the codepaths involved were not carefully vetted\n and we did not bother supporting such usage. This release attempts\n to allow object transfer out of a shallowly-cloned repository in a\n more controlled way (i.e. the receiver become a shallow repository\n with a truncated history).\n\n * Just like we give a reasonable default for \"less\" via the LESS\n environment variable, we now specify a reasonable default for \"lv\"\n via the \"LV\" environment variable when spawning the pager.\n\n * Two-level configuration variable names in \"branch.*\" and \"remote.*\"\n hierarchies, whose variables are predominantly three-level, were\n not completed by hitting a in bash and zsh completions.\n\n * Fetching 'frotz' branch with \"git fetch\", while 'frotz/nitfol'\n remote-tracking branch from an earlier fetch was still there, would\n error out, primarily because the command was not told that it is\n allowed to lose any information on our side. \"git fetch --prune\"\n now can be used to remove 'frotz/nitfol' to make room to fetch and\n store 'frotz' remote-tracking branch.\n\n * \"diff.orderfile=\" configuration variable can be used to\n pretend as if the \"-O\" option were given from the command\n line of \"git diff\", etc.\n\n * The negative pathspec syntax allows \"git log -- . ':!dir'\" to tell\n us \"I am interested in everything but 'dir' directory\".\n\n * \"git difftool\" shows how many different paths there are in total,\n and how many of them have been shown so far, to indicate progress.\n\n * \"git push origin master\" used to push our 'master' branch to update\n the 'master' branch at the 'origin' repository. This has been\n enhanced to use the same ref mapping \"git push origin\" would use to\n determine what ref at the 'origin' to be updated with our 'master'.\n For example, with this configuration\n\n [remote \"origin\"]\n push = refs/heads/*:refs/review/*\n\n that would cause \"git push origin\" to push out our local branches\n to corresponding refs under refs/review/ hierarchy at 'origin',\n \"git push origin master\" would update 'refs/review/master' over\n there. Alternatively, if push.default is set to 'upstream' and our\n 'master' is set to integrate with 'topic' from the 'origin' branch,\n running \"git push origin\" while on our 'master' would update their\n 'topic' branch, and running \"git push origin master\" while on any\n of our branches does the same.\n\n * \"gitweb\" learned to treat ref hierarchies other than refs/heads as\n if they are additional branch namespaces (e.g. refs/changes/ in\n Gerrit).\n\n * \"git for-each-ref --format=...\" learned a few formatting directives;\n e.g. \"%(color:red)%(HEAD)%(color:reset) %(refname:short) %(subject)\".\n\n * The command string given to \"git submodule foreach\" is passed\n directly to the shell, without being eval'ed. This is a backward\n incompatible change that may break existing users.\n\n * \"git log\" and friends learned the \"--exclude=\" option, to\n allow people to say \"list history of all branches except those that\n match this pattern\" with \"git log --exclude='*/*' --branches\".\n\n * \"git rev-parse --parseopt\" learned a new \"--stuck-long\" option to\n help scripts parse options with an optional parameter.\n\n * The \"--tags\" option to \"git fetch\" no longer tells the command to\n fetch _only_ the tags. It instead fetches tags _in addition to_\n what are fetched by the same command line without the option.\n\n\nPerformance, Internal Implementation, etc.\n\n * When parsing a 40-hex string into the object name, the string is\n checked to see if it can be interpreted as a ref so that a warning\n can be given for ambiguity. The code kicked in even when the\n core.warnambiguousrefs is set to false to squelch this warning, in\n which case the cycles spent to look at the ref namespace were an\n expensive no-op, as the result was discarded without being used.\n\n * The naming convention of the packfiles has been updated; it used to\n be based on the enumeration of names of the objects that are\n contained in the pack, but now it also depends on how the packed\n result is represented---packing the same set of objects using\n different settings (or delta order) would produce a pack with\n different name.\n\n * \"git diff --no-index\" mode used to unnecessarily attempt to read\n the index when there is one.\n\n * The deprecated parse-options macro OPT_BOOLEAN has been removed;\n use OPT_BOOL or OPT_COUNTUP in new code.\n\n * A few duplicate implementations of prefix/suffix string comparison\n functions have been unified to starts_with() and ends_with().\n\n * The new PERLLIB_EXTRA makefile variable can be used to specify\n additional directories Perl modules (e.g. the ones necessary to run\n git-svn) are installed on the platform when building.\n\n * \"git merge-base\" learned the \"--fork-point\" mode, that implements\n the same logic used in \"git pull --rebase\" to find a suitable fork\n point out of the reflog entries for the remote-tracking branch the\n work has been based on. \"git rebase\" has the same logic that can be\n triggered with the \"--fork-point\" option.\n\n * A third-party \"receive-pack\" (the responder to \"git push\") can\n advertise the \"no-thin\" capability to tell \"git push\" not to use\n the thin-pack optimization. Our receive-pack has always been\n capable of accepting and fattening a thin-pack, and will continue\n not to ask \"git push\" to use a non-thin pack.\n\n\nAlso contains various documentation updates and code clean-ups.\n\n\nFixes since v1.8.5\n------------------\n\nUnless otherwise noted, all the fixes since v1.8.5 in the maintenance\ntrack are contained in this release (see the maintenance releases' notes\nfor details).\n\n * \"submodule.*.update=checkout\", when propagated from .gitmodules to\n .git/config, turned into a \"submodule.*.update=none\", which did not\n make much sense.\n (merge efa8fd7 fp/submodule-checkout-mode later to maint).\n\n * The implementation of 'git stash $cmd \"stash@{...}\"' did not quote\n the stash argument properly and left it split at IFS whitespace.\n (merge 2a07e43 ow/stash-with-ifs later to maint).\n\n * The \"--[no-]informative-errors\" options to \"git daemon\" were parsed\n a bit too loosely, allowing any other string after these option\n names.\n (merge 82246b7 nd/daemon-informative-errors-typofix later to maint).\n\n * There is no reason to have a hardcoded upper limit of the number of\n parents for an octopus merge, created via the graft mechanism, but\n there was.\n (merge e228c17 js/lift-parent-count-limit later to maint).\n\n * The basic test used to leave unnecessary trash directories in the\n t/ directory.\n (merge 738a8be jk/test-framework-updates later to maint).\n\n * \"git merge-base --octopus\" used to leave cleaning up suboptimal\n result to the caller, but now it does the clean-up itself.\n (merge 8f29299 bm/merge-base-octopus-dedup later to maint).\n\n * A \"gc\" process running as a different user should be able to stop a\n new \"gc\" process from starting, but it didn't.\n (merge ed7eda8 km/gc-eperm later to maint).\n\n * An earlier \"clean-up\" introduced an unnecessary memory leak.\n (merge e1c1a32 jk/credential-plug-leak later to maint).\n\n * \"git add -A\" (no other arguments) in a totally empty working tree\n used to emit an error.\n (merge 64ed07c nd/add-empty-fix later to maint).\n\n * \"git log --decorate\" did not handle a tag pointed by another tag\n nicely.\n (merge 5e1361c bc/log-decoration later to maint).\n\n * When we figure out how many file descriptors to allocate for\n keeping packfiles open, a system with non-working getrlimit() could\n cause us to die(), but because we make this call only to get a\n rough estimate of how many is available and we do not even attempt\n to use up all file descriptors available ourselves, it is nicer to\n fall back to a reasonable low value rather than dying.\n (merge 491a8de jh/rlimit-nofile-fallback later to maint).\n\n * read_sha1_file(), that is the workhorse to read the contents given\n an object name, honoured object replacements, but there was no\n corresponding mechanism to sha1_object_info() that was used to\n obtain the metainfo (e.g. type & size) about the object. This led\n callers to weird inconsistencies.\n (merge 663a856 cc/replace-object-info later to maint).\n\n * \"git cat-file --batch=\", an admittedly useless command, did not\n behave very well.\n (merge 6554dfa jk/cat-file-regression-fix later to maint).\n\n * \"git rev-parse -- \" did not implement the usual\n disambiguation rules the commands in the \"git log\" family used in\n the same way.\n (merge 62f162f jk/rev-parse-double-dashes later to maint).\n\n * \"git mv A B/\", when B does not exist as a directory, should error\n out, but it didn't.\n (merge c57f628 mm/mv-file-to-no-such-dir-with-slash later to maint).\n\n * A workaround to an old bug in glibc prior to glibc 2.17 has been\n retired; this would remove a side effect of the workaround that\n corrupts system error messages in non-C locales.\n\n * SSL-related options were not passed correctly to underlying socket\n layer in \"git send-email\".\n (merge 5508f3e tr/send-email-ssl later to maint).\n\n * \"git commit -v\" appends the patch to the log message before\n editing, and then removes the patch when the editor returned\n control. However, the patch was not stripped correctly when the\n first modified path was a submodule.\n (merge 1a72cfd jl/commit-v-strip-marker later to maint).\n\n * \"git fetch --depth=0\" was a no-op, and was silently ignored.\n Diagnose it as an error.\n (merge 5594bca nd/transport-positive-depth-only later to maint).\n\n * Remote repository URL expressed in scp-style host:path notation are\n parsed more carefully (e.g. \"foo/bar:baz\" is local, \"[::1]:/~user\" asks\n to connect to user's home directory on host at address ::1.\n (merge a2036d7 tb/clone-ssh-with-colon-for-port later to maint).\n\n * \"git diff -- ':(icase)makefile'\" was unnecessarily rejected at the\n command line parser.\n (merge 887c6c1 nd/magic-pathspec later to maint).\n\n * \"git cat-file --batch-check=ok\" did not check the existence of\n the named object.\n (merge 4ef8d1d sb/sha1-loose-object-info-check-existence later to maint).\n\n * \"git am --abort\" sometimes complained about not being able to write\n a tree with an 0{40} object in it.\n (merge 77b43ca jk/two-way-merge-corner-case-fix later to maint).\n\n * Two processes creating loose objects at the same time could have\n failed unnecessarily when the name of their new objects started\n with the same byte value, due to a race condition.\n (merge b2476a6 jh/loose-object-dirs-creation-race later to maint).\n\n----------------------------------------------------------------\n\nChanges since v1.8.5 are as follows:\n\nAnders Kaseorg (1):\n submodule foreach: skip eval for more than one argument\n\nAntoine Pelisse (2):\n Prevent buffer overflows when path is too long\n remote-hg: test 'shared_path' in a moved clone\n\nBenny Siegert (1):\n Add MirBSD support to the build system.\n\nBrodie Rao (1):\n sha1_name: don't resolve refs when core.warnambiguousrefs is false\n\nCarlos Martín Nieto (1):\n send-pack: don't send a thin pack to a server which doesn't support it\n\nChristian Couder (15):\n environment: normalize use of prefixcmp() by removing \" != 0\"\n builtin/remote: remove postfixcmp() and use suffixcmp() instead\n strbuf: introduce starts_with() and ends_with()\n replace {pre,suf}fixcmp() with {starts,ends}_with()\n rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT\n replace_object: don't check read_replace_refs twice\n sha1_file.c: add lookup_replace_object_extended() to pass flags\n sha1_object_info_extended(): add an \"unsigned flags\" parameter\n t6050: show that git cat-file --batch fails with replace objects\n sha1_file: perform object replacement in sha1_object_info_extended()\n builtin/replace: teach listing using short, medium or full formats\n t6050: add tests for listing with --format\n builtin/replace: unset read_replace_refs\n Documentation/git-replace: describe --format option\n replace info: rename 'full' to 'long' and clarify in-code symbols\n\nCrestez Dan Leonard (1):\n git p4: Use git diff-tree instead of format-patch\n\nFelipe Contreras (9):\n test-lib.sh: convert $TEST_DIRECTORY to an absolute path\n test-bzr.sh, test-hg.sh: allow running from any dir\n remote-helpers: add extra safety checks\n remote-hg: fix 'shared path' path\n remote-hg: add tests for special filenames\n abspath: trivial style fix\n t: trivial whitespace cleanups\n fetch: add missing documentation\n remote: fix status with branch...rebase=preserve\n\nFrancesco Pretto (1):\n git-submodule.sh: 'checkout' is a valid update mode\n\nGreg Jacobson (1):\n push: enhance unspecified push default warning\n\nJason St. John (6):\n Documentation/git-log: update \"--log-size\" description\n Documentation/git-log.txt: mark-up fix and minor rephasing\n State correct usage of literal examples in man pages in the coding standards\n Documentation/rev-list-options.txt: fix mark-up\n Documentation/rev-list-options.txt: fix some grammatical issues and typos\n Documentation/gitcli.txt: fix double quotes\n\nJeff King (30):\n log_tree_diff: die when we fail to parse a commit\n assume parse_commit checks commit->object.parsed\n assume parse_commit checks for NULL commit\n use parse_commit_or_die instead of segfaulting\n use parse_commit_or_die instead of custom message\n checkout: do not die when leaving broken detached HEAD\n sha1write: make buffer const-correct\n use @@PERL@@ in built scripts\n http: return curl's AUTHAVAIL via slot_results\n remote-curl: pass curl slot_results back through run_slot\n unpack-trees: fix \"read-tree -u --reset A B\" with conflicted index\n drop support for \"experimental\" loose objects\n t5000: simplify gzip prerequisite checks\n pack-objects: name pack files after trailer hash\n rev-parse: correctly diagnose revision errors before \"--\"\n rev-parse: be more careful with munging arguments\n cat-file: pass expand_data to print_object_or_die\n cat-file: handle --batch format with missing type/size\n pack-objects doc: treat output filename as opaque\n diff.c: fix some recent whitespace style violations\n builtin/prune.c: use strbuf to avoid having to worry about PATH_MAX\n do not pretend sha1write returns errors\n sha1_object_info_extended: provide delta base sha1s\n cat-file: provide %(deltabase) batch format\n Revert \"prompt: clean up strbuf usage\"\n use distinct username/password for http auth tests\n t0000: set TEST_OUTPUT_DIRECTORY for sub-tests\n t0000: simplify HARNESS_ACTIVE hack\n t0000: drop \"known breakage\" test\n t5531: further \"matching\" fixups\n\nJens Lehmann (4):\n submodule update: remove unnecessary orig_flags variable\n commit -v: strip diffs and submodule shortlogs from the commit message\n mv: better document side effects when moving a submodule\n rm: better document side effects when removing a submodule\n\nJohan Herland (1):\n sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs\n\nJohannes Schindelin (1):\n Remove the line length limit for graft files\n\nJohannes Sixt (4):\n document --exclude option\n git_connect: remove artificial limit of a remote command\n git_connect: factor out discovery of the protocol and its parts\n mv: let 'git mv file no-such-dir/' error out on Windows, too\n\nJohn Keeping (8):\n repo-config: remove deprecated alias for \"git config\"\n tar-tree: remove deprecated command\n lost-found: remove deprecated command\n peek-remote: remove deprecated alias of ls-remote\n pull: use merge-base --fork-point when appropriate\n rebase: use reflog to find common base with upstream\n rebase: fix fork-point with zero arguments\n pull: suppress error when no remoteref is found\n\nJohn Murphy (1):\n git-gui: corrected setup of git worktree under cygwin.\n\nJohn Szakmeister (1):\n contrib/git-credential-gnome-keyring.c: small stylistic cleanups\n\nJonathan Nieder (16):\n git-remote-mediawiki: do not remove installed files in \"clean\" target\n git-remote-mediawiki: honor DESTDIR in \"make install\"\n git-remote-mediawiki build: make 'install' command configurable\n git-remote-mediawiki build: handle DESTDIR/INSTLIBDIR with whitespace\n Makefile: rebuild perl scripts when perl paths change\n Makefile: add PERLLIB_EXTRA variable that adds to default perl path\n mark Windows build scripts executable\n mark perl test scripts executable\n mark contributed hooks executable\n contrib: remove git-p4import\n test: make FILEMODE a lazy prereq\n test: replace shebangs with descriptions in shell libraries\n remove #!interpreter line from shell libraries\n stop installing git-tar-tree link\n pager: set LV=-c alongside LESS=FRSX\n diff test: reading a directory as a file need not error out\n\nJunio C Hamano (28):\n revision: introduce --exclude= to tame wildcards\n merge-base: use OPT_CMDMODE and clarify the command line parsing\n merge-base: teach \"--fork-point\" mode\n rev-list --exclude: tests\n rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API\n rev-parse: introduce --exclude= to tame wildcards\n t1005: reindent\n t1005: add test for \"read-tree --reset -u A B\"\n sha1_loose_object_info(): do not return success on missing object\n bundle: use argv-array\n submodule: do not copy unknown update mode from .gitmodules\n Git 1.8.4.5\n Git 1.8.5.1\n builtin/push.c: use strbuf instead of manual allocation\n push: use remote.$name.push as a refmap\n push: also use \"upstream\" mapping when pushing a single ref\n Start 1.9 cycle\n Update draft release notes to 1.9\n prune-packed: use strbuf to avoid having to worry about PATH_MAX\n Git 1.8.5.2\n Update draft release notes to 1.9\n get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure\n merge-base: separate \"--independent\" codepath into its own helper\n merge-base --octopus: reduce the result from get_octopus_merge_bases()\n Update draft release notes to 1.9\n Git 1.8.5.3\n Update draft release notes to 1.9\n Git 1.9-rc0\n\nKarsten Blees (1):\n gitignore.txt: clarify recursive nature of excluded directories\n\nKrzesimir Nowak (4):\n gitweb: Move check-ref-format code into separate function\n gitweb: Return 1 on validation success instead of passed input\n gitweb: Add a feature for adding more branch refs\n gitweb: Denote non-heads, non-remotes branches\n\nKyle J. McKay (1):\n gc: notice gc processes run by other users\n\nMads Dørup (1):\n git-gui: Improve font rendering on retina macbooks\n\nMasanari Iida (4):\n typofixes: fix misspelt comments\n Documentation/technical/http-protocol.txt: typofixes\n contrib: typofixes\n git-gui: correct spelling errors in comments\n\nMatthieu Moy (1):\n mv: let 'git mv file no-such-dir/' error out\n\nMax Kirillov (2):\n git-gui: Add gui.displayuntracked option\n git-gui: right half window is paned\n\nMichael Haggerty (27):\n t5510: use the correct tag name in test\n t5510: prepare test refs more straightforwardly\n t5510: check that \"git fetch --prune --tags\" does not prune branches\n api-remote.txt: correct section \"struct refspec\"\n get_ref_map(): rename local variables\n builtin/fetch.c: reorder function definitions\n get_expanded_map(): add docstring\n get_expanded_map(): avoid memory leak\n fetch: only opportunistically update references based on command line\n fetch --tags: fetch tags *in addition to* other stuff\n fetch --prune: prune only based on explicit refspecs\n query_refspecs(): move some constants out of the loop\n builtin/remote.c: reorder function definitions\n builtin/remote.c:update(): use struct argv_array\n fetch, remote: properly convey --no-prune options to subprocesses\n fetch-options.txt: simplify ifdef/ifndef/endif usage\n git-fetch.txt: improve description of tag auto-following\n ref_remove_duplicates(): avoid redundant bisection\n t5536: new test of refspec conflicts when fetching\n ref_remove_duplicates(): simplify loop logic\n ref_remote_duplicates(): extract a function handle_duplicate()\n handle_duplicate(): mark error message for translation\n fetch: improve the error messages emitted for conflicting refspecs\n cmd_repack(): remove redundant local variable \"nr_packs\"\n shorten_unambiguous_ref(): introduce a new local variable\n gen_scanf_fmt(): delete function and use snprintf() instead\n shorten_unambiguous_ref(): tighten up pointer arithmetic\n\nNguyễn Thái Ngọc Duy (41):\n wt-status: take the alignment burden off translators\n diff: restrict pathspec limitations to diff b/f case only\n glossary-content.txt: fix documentation of \"**\" patterns\n gettext.c: detect the vsnprintf bug at runtime\n clone,fetch: catch non positive --depth option value\n glossary-content.txt: rephrase magic signature part\n Support pathspec magic :(exclude) and its short form :!\n pathspec.c: support adding prefix magic to a pathspec with mnemonic magic\n parse-options: remove OPT_BOOLEAN\n transport.h: remove send_pack prototype, already defined in send-pack.h\n remote.h: replace struct extra_have_objects with struct sha1_array\n send-pack: forbid pushing from a shallow repository\n clone: prevent --reference to a shallow repository\n make the sender advertise shallow commits to the receiver\n connect.c: teach get_remote_heads to parse \"shallow\" lines\n shallow.c: extend setup_*_shallow() to accept extra shallow commits\n shallow.c: the 8 steps to select new commits for .git/shallow\n shallow.c: steps 6 and 7 to select new commits for .git/shallow\n fetch-pack.c: move shallow update code out of fetch_pack()\n fetch-pack.h: one statement per bitfield declaration\n clone: support remote shallow repository\n fetch: support fetching from a shallow repository\n upload-pack: make sure deepening preserves shallow roots\n fetch: add --update-shallow to accept refs that update .git/shallow\n receive-pack: reorder some code in unpack()\n receive/send-pack: support pushing from a shallow clone\n add GIT_SHALLOW_FILE to propagate --shallow-file to subprocesses\n connected.c: add new variant that runs with --shallow-file\n receive-pack: allow pushes that update .git/shallow\n send-pack: support pushing to a shallow clone\n remote-curl: pass ref SHA-1 to fetch-pack as well\n smart-http: support shallow fetch/clone\n receive-pack: support pushing to a shallow clone via http\n send-pack: support pushing from a shallow clone via http\n clone: use git protocol for cloning shallow repo locally\n prune: clean .git/shallow after pruning objects\n git-clone.txt: remove shallow clone limitations\n daemon: be strict at parsing parameters --[no-]informative-errors\n add: don't complain when adding empty project root\n commit.c: make \"tree\" a const pointer in commit_tree*()\n t5537: fix incorrect expectation in test case 10\n\nNick Townsend (1):\n ref-iteration doc: add_submodule_odb() returns 0 for success\n\nNicolas Vigier (2):\n Use the word 'stuck' instead of 'sticked'\n rev-parse --parseopt: add the --stuck-long mode\n\nPat Thoyts (3):\n git-gui: added gui.maxrecentrepo to extend the number of remembered repos\n git-gui: show the maxrecentrepo config option in the preferences dialog\n git-gui: add menu item to launch a bash shell on Windows.\n\nPaul Mackerras (1):\n gitk: Tag display improvements\n\nRalf Thielow (1):\n l10n: de.po: fix translation of 'prefix'\n\nRamkumar Ramachandra (12):\n t6300 (for-each-ref): clearly demarcate setup\n t6300 (for-each-ref): don't hardcode SHA-1 hexes\n for-each-ref: introduce %(HEAD) asterisk marker\n for-each-ref: introduce %(upstream:track[short])\n for-each-ref: introduce %(color:...) for color\n for-each-ref: avoid color leakage\n for-each-ref: remove unused variable\n zsh completion: find matching custom bash completion\n completion: introduce __gitcomp_nl_append ()\n completion: fix branch.autosetup(merge|rebase)\n completion: fix remote.pushdefault\n completion: complete format.coverLetter\n\nRamsay Allan Jones (2):\n send-pack.c: mark a file-local function static\n shallow: remove unused code\n\nRené Scharfe (1):\n SubmittingPatches: document how to handle multiple patches\n\nRichard Hansen (6):\n test-bzr.sh, test-hg.sh: prepare for change to push.default=simple\n test-hg.sh: eliminate 'local' bashism\n test-hg.sh: avoid obsolete 'test' syntax\n test-hg.sh: fix duplicate content strings in author tests\n test-hg.sh: help user correlate verbose output with email test\n remote-bzr, remote-hg: fix email address regular expression\n\nRoberto Tyley (1):\n docs: add filter-branch notes on The BFG\n\nRoman Kagan (2):\n git-svn: workaround for a bug in svn serf backend\n git-svn: workaround for a bug in svn serf backend\n\nSamuel Bronson (3):\n t4056: add new tests for \"git diff -O\"\n diff: let \"git diff -O\" read orderfile from any file and fail properly\n diff: add diff.orderfile configuration variable\n\nSebastian Schuberth (3):\n git.c: consistently use the term \"builtin\" instead of \"internal command\"\n builtin/help.c: call load_command_list() only when it is needed\n builtin/help.c: speed up is_git_command() by checking for builtin commands first\n\nThomas Ackermann (2):\n user-manual: improve html and pdf formatting\n pack-heuristics.txt: mark up the file header properly\n\nThomas Gummerer (4):\n diff: move no-index detection to builtin/diff.c\n diff: don't read index when --no-index is given\n diff: add test for --no-index executed outside repo\n diff: avoid some nesting\n\nThomas Rast (13):\n commit-slab: document clear_$slabname()\n commit-slab: declare functions \"static inline\"\n Documentation: revamp git-cherry(1)\n gitk: Support -G option from the command line\n gitk: Refactor per-line part of getblobdiffline and its support\n gitk: Split out diff part in $commitinfo\n gitk: Support showing the gathered inline diffs\n gitk: Recognize -L option\n commit-slab: sizeof() the right type in xrealloc\n send-email: pass Debug to Net::SMTP::SSL::new\n send-email: --smtp-ssl-cert-path takes an argument\n send-email: set SSL options through IO::Socket::SSL::set_client_defaults\n config: arbitrary number of matches for --unset and --replace-all\n\nTom Miller (2):\n fetch --prune: always print header url\n fetch --prune: Run prune before fetching\n\nTorsten Bögershausen (9):\n git-fetch-pack uses URLs like git-fetch\n t5601: remove clear_ssh, refactor setup_ssh_wrapper\n t5601: add tests for ssh\n git fetch-pack: add --diag-url\n t5500: add test cases for diag-url\n git fetch: support host:/~repo\n git_connect(): refactor the port handling for ssh\n connect.c: refactor url parsing\n git_connect(): use common return point\n\nVasily Makarov (1):\n get_octopus_merge_bases(): cleanup redundant variable\n\nW. Trevor King (1):\n Documentation/gitmodules: Only 'update' and 'url' are required\n\nZoltan Klinger (1):\n difftool: display the number of files in the diff queue in the prompt\n\nbrian m. carlson (3):\n remote-curl: fix large pushes with GSSAPI\n Documentation: document pitfalls with 3-way merge\n log: properly handle decorations with chained tags\n\njcb91 (1):\n remote-hg: avoid buggy strftime()\n\nØystein Walle (1):\n stash: handle specifying stashes with $IFS\n"},{"id":"233509","messageId":"CALZVapmqcFjjKeURHdP4chkB+T2--caJZYiJBzdwq7Ou=HzO5w@mail.gmail.com","threadId":"35673","inReplyTo":"xmqqha8xt22p.fsf@gitster.dls.corp.google.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Javier Domingo Cansino","fromEmail":"javierdo1@gmail.com","sentAt":"2014-01-22T12:53:26Z","receivedAt":"2014-01-22T12:53:26Z","isPatch":false,"sender":{"key":"javierdo1@gmail.com","avatar":"https://gravatar.com/avatar/0f43d4d2e5f4320e8b5e1a46914213c5459dd0de261ab1587f222827f863d727?d=mp&s=160"},"body":"Will there be any change on how tarballs are distributed, taking into\naccount that Google will be shutting down Google Code Downloads\nsection[1][2]?\n\nCheers\n\nJavier Domingo Cansino\n\n[1] Google Code download service change announcement:\nhttp://google-opensource.blogspot.se/2013/05/a-change-to-google-code-download-service.html\n[2] Google Code download section FAQ:\nhttps://code.google.com/p/support/wiki/DownloadsFAQ\n"},{"id":"233516","messageId":"xmqqk3dsyqej.fsf@gitster.dls.corp.google.com","threadId":"35673","inReplyTo":"CALZVapmqcFjjKeURHdP4chkB+T2--caJZYiJBzdwq7Ou=HzO5w@mail.gmail.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-01-22T15:42:12Z","receivedAt":"2014-01-22T15:42:12Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Javier Domingo Cansino writes:\n\n> Will there be any change on how tarballs are distributed, taking into\n> account that Google will be shutting down Google Code Downloads\n> section[1][2]?\n\nAside from the obvious \"we won't be able to use something that is no\nlonger offered\"? They are not the only download site even now, so...\n"},{"id":"233517","messageId":"52DFE882.2040605@atlas-elektronik.com","threadId":"35673","inReplyTo":"CALZVapmqcFjjKeURHdP4chkB+T2--caJZYiJBzdwq7Ou=HzO5w@mail.gmail.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Stefan Näwe","fromEmail":"stefan.naewe@atlas-elektronik.com","sentAt":"2014-01-22T15:49:22Z","receivedAt":"2014-01-22T15:49:22Z","isPatch":false,"sender":{"key":"stefan.naewe@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4468?v=4"},"body":"Am 22.01.2014 13:53, schrieb Javier Domingo Cansino:\n> Will there be any change on how tarballs are distributed, taking into\n> account that Google will be shutting down Google Code Downloads\n> section[1][2]?\n> \n\nAm I missing something or what's wrong with this:\n\n https://github.com/gitster/git/archive/v1.9-rc0.tar.gz\n\nor any\n\n https://github.com/gitster/git/archive/$TAG.tar.gz\n\n??\n\n(As long as Junio continues to push to github, of course)\n\nStefan\n-- \n----------------------------------------------------------------\n/dev/random says: Folks who think they know it all bug those of us who do\npython -c \"print '73746566616e2e6e616577654061746c61732d656c656b74726f6e696b2e636f6d'.decode('hex')\"\n"},{"id":"233521","messageId":"xmqq7g9syp1m.fsf@gitster.dls.corp.google.com","threadId":"35673","inReplyTo":"52DFE882.2040605@atlas-elektronik.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-01-22T16:11:33Z","receivedAt":"2014-01-22T16:11:33Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Näwe writes:\n\n> Am 22.01.2014 13:53, schrieb Javier Domingo Cansino:\n>> Will there be any change on how tarballs are distributed, taking into\n>> account that Google will be shutting down Google Code Downloads\n>> section[1][2]?\n>> \n>\n> Am I missing something or what's wrong with this:\n>\n> https://github.com/gitster/git/archive/v1.9-rc0.tar.gz\n>\n> or any\n>\n> https://github.com/gitster/git/archive/$TAG.tar.gz\n>\n> ??\n\nDo these consume CPU every time somebody asks for a tarball? That\nmight be considered \"wrong\" depending on the view.\n"},{"id":"233525","messageId":"CAFFjANTNLnc4GcVeSEvuWpfYVXJchJqkHwvUVdREdXmWx6e4=Q@mail.gmail.com","threadId":"35673","inReplyTo":"xmqq7g9syp1m.fsf@gitster.dls.corp.google.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Vicent Martí","fromEmail":"tanoku@gmail.com","sentAt":"2014-01-22T17:26:23Z","receivedAt":"2014-01-22T17:26:23Z","isPatch":false,"sender":{"key":"tanoku@gmail.com","avatar":"https://gravatar.com/avatar/271386991cb4c2b8f1e1ed1d059f3422cc3485de7a598f65043f70be021d095b?d=mp&s=160"},"body":"On Wed, Jan 22, 2014 at 5:11 PM, Junio C Hamano wrote:\n> Stefan Näwe writes:\n>\n>> Am 22.01.2014 13:53, schrieb Javier Domingo Cansino:\n>>> Will there be any change on how tarballs are distributed, taking into\n>>> account that Google will be shutting down Google Code Downloads\n>>> section[1][2]?\n>>>\n>>\n>> Am I missing something or what's wrong with this:\n>>\n>> https://github.com/gitster/git/archive/v1.9-rc0.tar.gz\n>>\n>> or any\n>>\n>> https://github.com/gitster/git/archive/$TAG.tar.gz\n>>\n>> ??\n>\n> Do these consume CPU every time somebody asks for a tarball? That\n> might be considered \"wrong\" depending on the view.\n\nNo, our infrastructure caches frequently requested tarballs so they\ndon't have to be regenerated on the fly. If you would prefer to\ndistribute a different version of the tarball for the release (e.g.\none with a different filename or folder structure), you can upload it\ndirectly to the release page of the tag:\n\n https://github.com/gitster/git/releases/tag/v1.9-rc0\n\nWe'll automatically mirror your release to S3 and serve it from there.\nYou can also go ahead and edit the release page with the changelog\nyou've posted in this email thread to make it more user friendly.\n\nWE WILL SERVE YOUR RELEASES, JUNIO\n\nBECAUSE WE LOVE YOU\n\n-vmg\n"},{"id":"233527","messageId":"xmqqlhy7yjjp.fsf@gitster.dls.corp.google.com","threadId":"35673","inReplyTo":"CAFFjANTNLnc4GcVeSEvuWpfYVXJchJqkHwvUVdREdXmWx6e4=Q@mail.gmail.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-01-22T18:10:18Z","receivedAt":"2014-01-22T18:10:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Vicent Martí writes:\n\n>> Do these consume CPU every time somebody asks for a tarball? That\n>> might be considered \"wrong\" depending on the view.\n>\n> No, our infrastructure caches frequently requested tarballs so they\n> don't have to be regenerated on the fly.\n\nThanks. That is certainly good enough for consumers, and better\nthan having to manually create and upload for me ;-)\n"},{"id":"233540","messageId":"20140122203030.GB14211@milliways","threadId":"35673","inReplyTo":"xmqqlhy7yjjp.fsf@gitster.dls.corp.google.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Ken Moffat","fromEmail":"zarniwhoop@ntlworld.com","sentAt":"2014-01-22T20:30:30Z","receivedAt":"2014-01-22T20:30:30Z","isPatch":false,"sender":{"key":"zarniwhoop@ntlworld.com","avatar":null},"body":"On Wed, Jan 22, 2014 at 10:10:18AM -0800, Junio C Hamano wrote:\n> Vicent Martí writes:\n> \n> >> Do these consume CPU every time somebody asks for a tarball? That\n> >> might be considered \"wrong\" depending on the view.\n> >\n> > No, our infrastructure caches frequently requested tarballs so they\n> > don't have to be regenerated on the fly.\n> \n> Thanks. That is certainly good enough for consumers, and better\n> than having to manually create and upload for me ;-)\n\n Two questions: Does regenerating (e.g. if the tarball has dropped\nout of the cache) change its sums (md5sum or similar) ? In (beyond)\nlinuxfromscratch we use md5sums to verify that a tarball has not\nchanged. Also, will there be links for manpages and htmldocs\ntarballs ?\n\n I note that all of these *are* still available at googlecode for\nthe moment : https://code.google.com/p/git-core/downloads/list\n\nĸen\n-- \ndas eine Mal als Tragödie, dieses Mal als Farce\n"},{"id":"233542","messageId":"xmqq61pbybi5.fsf@gitster.dls.corp.google.com","threadId":"35673","inReplyTo":"20140122203030.GB14211@milliways","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-01-22T21:04:02Z","receivedAt":"2014-01-22T21:04:02Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ken Moffat writes:\n\n> I note that all of these *are* still available at googlecode for\n> the moment : https://code.google.com/p/git-core/downloads/list\n\nAs I said, Cgc is not the ony download site. The end of\n\n http://git-blame.blogspot.com/p/git-public-repositories.html\n\nlists the two sites that currently have the material. I may replace\nCgc with something else (and add it/them to the list), but in the\nmeantime I do not think k.org will go out of business in anytime\nsoon, so...\n"},{"id":"233568","messageId":"20140122231148.GA18061@milliways","threadId":"35673","inReplyTo":"xmqq61pbybi5.fsf@gitster.dls.corp.google.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Ken Moffat","fromEmail":"zarniwhoop@ntlworld.com","sentAt":"2014-01-22T23:11:48Z","receivedAt":"2014-01-22T23:11:48Z","isPatch":false,"sender":{"key":"zarniwhoop@ntlworld.com","avatar":null},"body":"On Wed, Jan 22, 2014 at 01:04:02PM -0800, Junio C Hamano wrote:\n> Ken Moffat writes:\n> \n> > I note that all of these *are* still available at googlecode for\n> > the moment : https://code.google.com/p/git-core/downloads/list\n> \n> As I said, Cgc is not the ony download site. The end of\n> \n> http://git-blame.blogspot.com/p/git-public-repositories.html\n> \n> lists the two sites that currently have the material. I may replace\n> Cgc with something else (and add it/them to the list), but in the\n> meantime I do not think k.org will go out of business in anytime\n> soon, so...\n> \n OK, thanks for the pointer to\nhttps://www.kernel.org/pub/software/scm/git/ for released tarballs.\n\nĸen\n-- \ndas eine Mal als Tragödie, dieses Mal als Farce\n"},{"id":"233580","messageId":"20140123020913.GF17254@sigill.intra.peff.net","threadId":"35673","inReplyTo":"20140122203030.GB14211@milliways","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2014-01-23T02:09:13Z","receivedAt":"2014-01-23T02:09:13Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jan 22, 2014 at 08:30:30PM +0000, Ken Moffat wrote:\n\n> Two questions: Does regenerating (e.g. if the tarball has dropped\n> out of the cache) change its sums (md5sum or similar) ? In (beyond)\n> linuxfromscratch we use md5sums to verify that a tarball has not\n> changed.\n\nThe tarballs we auto-generate from tags are cached, but they can\nchange if the cached version expires _and_ the archive-generation code\nchanges.\n\nWe use \"git archive\" to generate the tarballs themselves, and then gzip\nthe with \"gzip -n\". So it should be consistent from run to run. However,\nvery occasionally there are bugfixes in \"git archive\" which can affect\nthe output. E.g., commit 22f0dcd (archive-tar: split long paths more\ncarefully, 2013-01-05) changes the representation of certain long paths,\nand generating a tarball with and without it will result in different\nchecksums (for some repos).\n\nSo if you are planning on baking md5sums into a package-build system, it\nis much better to point at \"official\" releases which are rolled once by\nthe project maintainer, rather than the automatic tag page.\n\nJunio, since you prepare such tarballs[1] anyway for kernel.org, it\nmight be worth uploading them to the \"Releases\" page of git/git. I\nimagine there is a programmatic way to do so via GitHub's API, but I\ndon't know offhand. I can look into it if you are interested.\n\n-Peff\n"},{"id":"233606","messageId":"xmqqha8uva2i.fsf@gitster.dls.corp.google.com","threadId":"35673","inReplyTo":"20140123020913.GF17254@sigill.intra.peff.net","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-01-23T18:15:33Z","receivedAt":"2014-01-23T18:15:33Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> Junio, since you prepare such tarballs[1] anyway for kernel.org, it\n> might be worth uploading them to the \"Releases\" page of git/git. I\n> imagine there is a programmatic way to do so via GitHub's API, but I\n> don't know offhand. I can look into it if you are interested.\n\nI already have a script that takes the three tarballs and uploads\nthem to two places, so adding GitHub as the third destination should\nbe a natural and welcome way to automate it.\n"},{"id":"233736","messageId":"20140124233635.GA31371@sigill.intra.peff.net","threadId":"35673","inReplyTo":"xmqqha8uva2i.fsf@gitster.dls.corp.google.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2014-01-24T23:36:36Z","receivedAt":"2014-01-24T23:36:36Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 23, 2014 at 10:15:33AM -0800, Junio C Hamano wrote:\n\n> Jeff King writes:\n> \n> > Junio, since you prepare such tarballs[1] anyway for kernel.org, it\n> > might be worth uploading them to the \"Releases\" page of git/git. I\n> > imagine there is a programmatic way to do so via GitHub's API, but I\n> > don't know offhand. I can look into it if you are interested.\n> \n> I already have a script that takes the three tarballs and uploads\n> them to two places, so adding GitHub as the third destination should\n> be a natural and welcome way to automate it.\n\nI came up with the script below, which you can use like:\n\n ./script v1.8.2.3 git-1.8.2.3.tar.gz\n\nIt expects the tag to already be pushed up to GitHub. I'll leave\nsticking it on the \"todo\" branch and integrating it into RelUpload to\nyou. This can also be used to backfill the old releases (though I looked\non k.org and it seems to have only partial coverage).\n\nIt sets the \"prerelease\" flag for -rc releases, but I did not otherwise\nfill in any fields, including the summary and description. GitHub seems\nto display reasonably if they are not set.\n\n-- >8 --\n#!/bin/sh\n#\n# usage: $0 \n\nrepo=git/git\n\n# replace this with however you store your oauth token\n# if you don't have one, make one here:\n# https://github.com/settings/tokens/new\ntoken() {\n pass -n github.web.oauth\n}\n\npost() {\n curl -H \"Authorization: token $(token)\" \"$@\"\n}\n\n# usage: create \ncreate() {\n case \"$1\" in\n *-rc*)\n prerelease=true\n ;;\n *)\n prerelease=false\n ;;\n esac\n\n post -d '\n {\n \"tag_name\": \"'\"$1\"'\",\n \"prerelease\": '\"$prerelease\"'\n }' \"https://api.github.com/repos/$repo/releases\"\n}\n\n# use: upload \nupload() {\n url=\"https://uploads.github.com/repos/$repo/releases/$1/assets\" &&\n url=\"$url?name=$(basename $2)\" &&\n post -H \"Content-Type: $(file -b --mime-type \"$2\")\" \\\n --data-binary \"@$2\" \\\n \"$url\"\n}\n\n# This is a hack. If you don't mind a dependency on\n# perl's JSON (or another parser), we can do a lot better.\nextract_id() {\n perl -lne '/\"id\":\\s*(\\d+)/ or next; print $1; exit 0'\n}\n\ncreate \"$1\" >release.json &&\nid=$(extract_id /dev/null &&\nrm -f release.json\n"},{"id":"233833","messageId":"20140127175953.GA18041@camk.edu.pl","threadId":"35673","inReplyTo":"xmqqha8xt22p.fsf@gitster.dls.corp.google.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Kacper Kornet","fromEmail":"kornet@camk.edu.pl","sentAt":"2014-01-27T17:59:54Z","receivedAt":"2014-01-27T17:59:54Z","isPatch":false,"sender":{"key":"kornet@camk.edu.pl","avatar":null},"body":"On Tue, Jan 21, 2014 at 02:14:22PM -0800, Junio C Hamano wrote:\n> It has been reported that turning git.rc into git.res does not like\n> the new 2-dewey-decimal release numbering scheme; packagers of\n> various distro might find similar issues in their build procedures,\n> in which case they have about 3 weeks to update them until the final\n> release.\n\nThe change in release numbering also breaks down gitolite v2 setups. One\nof the gitolite commands, gl-compile-conf, expects the output of git --version \nto match /git version (\\d+)\\.(\\d+)\\.(\\d+)/. \n\nI have no idea how big problem it is, as I don't know how many people\nhasn't migrate to gitolite v3 yet. \n\n-- \n Kacper\n"},{"id":"233834","messageId":"20140127185829.GE27577@google.com","threadId":"35673","inReplyTo":"20140127175953.GA18041@camk.edu.pl","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2014-01-27T18:58:29Z","receivedAt":"2014-01-27T18:58:29Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nKacper Kornet wrote:\n\n> The change in release numbering also breaks down gitolite v2 setups. One\n> of the gitolite commands, gl-compile-conf, expects the output of git --version \n> to match /git version (\\d+)\\.(\\d+)\\.(\\d+)/. \n>\n> I have no idea how big problem it is, as I don't know how many people\n> hasn't migrate to gitolite v3 yet. \n\nhttp://qa.debian.org/popcon.php?package=gitolite says there are some.\nI guess soon we'll see if there are complaints.\n\nhttp://gitolite.com/gitolite/migr.html says gitolite v2 is still\nmaintained. Hopefully the patch to gitolite v2 to fix this would not\nbe too invasive --- e.g., how about this patch (untested)?\n\nThanks,\nJonathan\n\ndiff --git i/src/gl-compile-conf w/src/gl-compile-conf\nindex f497ae5..8508313 100755\n--- i/src/gl-compile-conf\n+++ w/src/gl-compile-conf\n@@ -394,8 +394,9 @@ die \"\n the server. If it is not, please edit ~/.gitolite.rc on the server and\n set the \\$GIT_PATH variable to the correct value\\n\n \" unless $git_version;\n-my ($gv_maj, $gv_min, $gv_patchrel) = ($git_version =~ m/git version (\\d+)\\.(\\d+)\\.(\\d+)/);\n+my ($gv_maj, $gv_min, $gv_patchrel) = ($git_version =~ m/git version (\\d+)\\.(\\d+)\\.([^.-]*)/);\n die \"$ABRT I can't understand $git_version\\n\" unless ($gv_maj >= 1);\n+$gv_patchrel = 0 unless ($gv_patchrel =~ m/^\\d+$/);\n $git_version = $gv_maj*10000 + $gv_min*100 + $gv_patchrel; # now it's \"normalised\"\n \n die \"\\n\\t\\t***** AAARGH! *****\\n\" .\n"},{"id":"233846","messageId":"xmqqy521m3tv.fsf@gitster.dls.corp.google.com","threadId":"35673","inReplyTo":"20140124233635.GA31371@sigill.intra.peff.net","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-01-27T22:56:28Z","receivedAt":"2014-01-27T22:56:28Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Thu, Jan 23, 2014 at 10:15:33AM -0800, Junio C Hamano wrote:\n>\n>> Jeff King writes:\n>> \n>> > Junio, since you prepare such tarballs[1] anyway for kernel.org, it\n>> > might be worth uploading them to the \"Releases\" page of git/git. I\n>> > imagine there is a programmatic way to do so via GitHub's API, but I\n>> > don't know offhand. I can look into it if you are interested.\n>> \n>> I already have a script that takes the three tarballs and uploads\n>> them to two places, so adding GitHub as the third destination should\n>> be a natural and welcome way to automate it.\n>\n> I came up with the script below, which you can use like:\n>\n> ./script v1.8.2.3 git-1.8.2.3.tar.gz\n>\n> It expects the tag to already be pushed up to GitHub. I'll leave\n> sticking it on the \"todo\" branch and integrating it into RelUpload to\n> you. This can also be used to backfill the old releases (though I looked\n> on k.org and it seems to have only partial coverage).\n>\n> It sets the \"prerelease\" flag for -rc releases, but I did not otherwise\n> fill in any fields, including the summary and description. GitHub seems\n> to display reasonably if they are not set.\n\nThanks.\n\n> -- >8 --\n> #!/bin/sh\n> #\n> # usage: $0 \n>\n> repo=git/git\n>\n> # replace this with however you store your oauth token\n> # if you don't have one, make one here:\n> # https://github.com/settings/tokens/new\n> token() {\n> pass -n github.web.oauth\n\nHmph, what is this \"pass\" thing?\n\n> }\n>\n> post() {\n> curl -H \"Authorization: token $(token)\" \"$@\"\n> }\n>\n> # usage: create \n> create() {\n> case \"$1\" in\n> *-rc*)\n> prerelease=true\n> ;;\n> *)\n> prerelease=false\n> ;;\n> esac\n>\n> post -d '\n> {\n> \"tag_name\": \"'\"$1\"'\",\n> \"prerelease\": '\"$prerelease\"'\n> }' \"https://api.github.com/repos/$repo/releases\"\n> }\n>\n> # use: upload \n> upload() {\n> url=\"https://uploads.github.com/repos/$repo/releases/$1/assets\" &&\n> url=\"$url?name=$(basename $2)\" &&\n> post -H \"Content-Type: $(file -b --mime-type \"$2\")\" \\\n> --data-binary \"@$2\" \\\n> \"$url\"\n> }\n>\n> # This is a hack. If you don't mind a dependency on\n> # perl's JSON (or another parser), we can do a lot better.\n> extract_id() {\n> perl -lne '/\"id\":\\s*(\\d+)/ or next; print $1; exit 0'\n> }\n>\n> create \"$1\" >release.json &&\n> id=$(extract_id upload \"$id\" \"$2\" >/dev/null &&\n> rm -f release.json\n"},{"id":"233854","messageId":"20140128000442.GA17227@sigill.intra.peff.net","threadId":"35673","inReplyTo":"xmqqy521m3tv.fsf@gitster.dls.corp.google.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2014-01-28T00:04:42Z","receivedAt":"2014-01-28T00:04:42Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Jan 27, 2014 at 02:56:28PM -0800, Junio C Hamano wrote:\n\n> > # replace this with however you store your oauth token\n> > # if you don't have one, make one here:\n> > # https://github.com/settings/tokens/new\n> > token() {\n> > pass -n github.web.oauth\n> \n> Hmph, what is this \"pass\" thing?\n\nIt's a poor man's Keychain:\n\n https://github.com/peff/pass\n\nJudging from your use of netrc in Meta/RelUpload, you probably just\nwant:\n\n token() {\n cat ~/.github-token\n }\n\n-Peff\n"},{"id":"233865","messageId":"20140128122851.GA1102@camk.edu.pl","threadId":"35673","inReplyTo":"20140127185829.GE27577@google.com","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Kacper Kornet","fromEmail":"kornet@camk.edu.pl","sentAt":"2014-01-28T12:28:51Z","receivedAt":"2014-01-28T12:28:51Z","isPatch":false,"sender":{"key":"kornet@camk.edu.pl","avatar":null},"body":"On Mon, Jan 27, 2014 at 10:58:29AM -0800, Jonathan Nieder wrote:\n> Hi,\n\n> Kacper Kornet wrote:\n\n> > The change in release numbering also breaks down gitolite v2 setups. One\n> > of the gitolite commands, gl-compile-conf, expects the output of git --version \n> > to match /git version (\\d+)\\.(\\d+)\\.(\\d+)/. \n\n> > I have no idea how big problem it is, as I don't know how many people\n> > hasn't migrate to gitolite v3 yet. \n\n> http://qa.debian.org/popcon.php?package=gitolite says there are some.\n> I guess soon we'll see if there are complaints.\n\n> http://gitolite.com/gitolite/migr.html says gitolite v2 is still\n> maintained. Hopefully the patch to gitolite v2 to fix this would not\n> be too invasive --- e.g., how about this patch (untested)?\n\n> Thanks,\n> Jonathan\n\n> diff --git i/src/gl-compile-conf w/src/gl-compile-conf\n> index f497ae5..8508313 100755\n> --- i/src/gl-compile-conf\n> +++ w/src/gl-compile-conf\n> @@ -394,8 +394,9 @@ die \"\n> the server. If it is not, please edit ~/.gitolite.rc on the server and\n> set the \\$GIT_PATH variable to the correct value\\n\n> \" unless $git_version;\n> -my ($gv_maj, $gv_min, $gv_patchrel) = ($git_version =~ m/git version (\\d+)\\.(\\d+)\\.(\\d+)/);\n> +my ($gv_maj, $gv_min, $gv_patchrel) = ($git_version =~ m/git version (\\d+)\\.(\\d+)\\.([^.-]*)/);\n> die \"$ABRT I can't understand $git_version\\n\" unless ($gv_maj >= 1);\n> +$gv_patchrel = 0 unless ($gv_patchrel =~ m/^\\d+$/);\n> $git_version = $gv_maj*10000 + $gv_min*100 + $gv_patchrel; # now it's \"normalised\"\n\n> die \"\\n\\t\\t***** AAARGH! *****\\n\" .\n\nIt works for 1.9.rc1 but I think it will fail with final 1.9. The\nfollowing version should be ok:\n\ndiff --git a/src/gl-compile-conf b/src/gl-compile-conf\nindex f497ae5..c391468 100755\n--- a/src/gl-compile-conf\n+++ b/src/gl-compile-conf\n@@ -394,7 +394,7 @@ die \"\n the server. If it is not, please edit ~/.gitolite.rc on the server and\n set the \\$GIT_PATH variable to the correct value\\n\n \" unless $git_version;\n-my ($gv_maj, $gv_min, $gv_patchrel) = ($git_version =~ m/git version (\\d+)\\.(\\d+)\\.(\\d+)/);\n+my ($gv_maj, $gv_min, undef, $gv_patchrel) = ($git_version =~ m/git version (\\d+)\\.(\\d+)(\\.(\\d+))?/);\n die \"$ABRT I can't understand $git_version\\n\" unless ($gv_maj >= 1);\n $git_version = $gv_maj*10000 + $gv_min*100 + $gv_patchrel; # now it's \"normalised\"\n \n-- \n Kacper\n"},{"id":"233961","messageId":"52EAD03D.5050802@gmail.com","threadId":"35673","inReplyTo":"20140128122851.GA1102@camk.edu.pl","subject":"Re: [ANNOUNCE] Git v1.9-rc0","fromName":"Sitaram Chamarty","fromEmail":"sitaramc@gmail.com","sentAt":"2014-01-30T22:20:45Z","receivedAt":"2014-01-30T22:20:45Z","isPatch":false,"sender":{"key":"sitaramc@gmail.com","avatar":"https://avatars.githubusercontent.com/u/43316?v=4"},"body":"On 01/28/2014 05:58 PM, Kacper Kornet wrote:\n> On Mon, Jan 27, 2014 at 10:58:29AM -0800, Jonathan Nieder wrote:\n>> Hi,\n> \n>> Kacper Kornet wrote:\n> \n>>> The change in release numbering also breaks down gitolite v2 setups. One\n>>> of the gitolite commands, gl-compile-conf, expects the output of git --version \n>>> to match /git version (\\d+)\\.(\\d+)\\.(\\d+)/. \n> \n>>> I have no idea how big problem it is, as I don't know how many people\n>>> hasn't migrate to gitolite v3 yet. \n> \n>> http://qa.debian.org/popcon.php?package=gitolite says there are some.\n>> I guess soon we'll see if there are complaints.\n> \n>> http://gitolite.com/gitolite/migr.html says gitolite v2 is still\n>> maintained. Hopefully the patch to gitolite v2 to fix this would not\n>> be too invasive --- e.g., how about this patch (untested)?\n> \n>> Thanks,\n>> Jonathan\n> \n>> diff --git i/src/gl-compile-conf w/src/gl-compile-conf\n>> index f497ae5..8508313 100755\n>> --- i/src/gl-compile-conf\n>> +++ w/src/gl-compile-conf\n>> @@ -394,8 +394,9 @@ die \"\n>> the server. If it is not, please edit ~/.gitolite.rc on the server and\n>> set the \\$GIT_PATH variable to the correct value\\n\n>> \" unless $git_version;\n>> -my ($gv_maj, $gv_min, $gv_patchrel) = ($git_version =~ m/git version (\\d+)\\.(\\d+)\\.(\\d+)/);\n>> +my ($gv_maj, $gv_min, $gv_patchrel) = ($git_version =~ m/git version (\\d+)\\.(\\d+)\\.([^.-]*)/);\n>> die \"$ABRT I can't understand $git_version\\n\" unless ($gv_maj >= 1);\n>> +$gv_patchrel = 0 unless ($gv_patchrel =~ m/^\\d+$/);\n>> $git_version = $gv_maj*10000 + $gv_min*100 + $gv_patchrel; # now it's \"normalised\"\n> \n>> die \"\\n\\t\\t***** AAARGH! *****\\n\" .\n> \n> It works for 1.9.rc1 but I think it will fail with final 1.9. The\n> following version should be ok:\n> \n> diff --git a/src/gl-compile-conf b/src/gl-compile-conf\n> index f497ae5..c391468 100755\n> --- a/src/gl-compile-conf\n> +++ b/src/gl-compile-conf\n> @@ -394,7 +394,7 @@ die \"\n> the server. If it is not, please edit ~/.gitolite.rc on the server and\n> set the \\$GIT_PATH variable to the correct value\\n\n> \" unless $git_version;\n> -my ($gv_maj, $gv_min, $gv_patchrel) = ($git_version =~ m/git version (\\d+)\\.(\\d+)\\.(\\d+)/);\n> +my ($gv_maj, $gv_min, undef, $gv_patchrel) = ($git_version =~ m/git version (\\d+)\\.(\\d+)(\\.(\\d+))?/);\n> die \"$ABRT I can't understand $git_version\\n\" unless ($gv_maj >= 1);\n> $git_version = $gv_maj*10000 + $gv_min*100 + $gv_patchrel; # now it's \"normalised\"\n\nGitolite v3 will be 2 years old in a month or so. I would prefer to use\nthis as an opportunity to encourage people to upgrade; v2 really has\nnothing going for it now.\n\nPeople who cannot upgrade gitolite should simply cut that whole block\nof code and throw it out. Distro's should probably do that if they are\nstill keeping gitolite v2 alive, because it is clearly not needed if the\nsame distro is up to 1.9 of git!\n\nMy policy has been to continue support for critical bugs. A bug that\ncan be fixed by simply deleting the offending code block, with no harm\ndone, is -- to my mind -- not critical enough :-)\n\nside note, Kacper: I'd use non-capturing parens than an undef in the\ndestination list.\n"}]}