{"shas":[["6a3c38b1b2f063d35a4e23858d7be5adc6ca99d7","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'hw/maint-abspath-cwd-limit' (early part) into pu\n\n* 'hw/maint-abspath-cwd-limit' (early part):\n  path.c: increase array size of cwd variable to PATH_MAX","Junio C Hamano"],["6bed9767daaaf8421ee6f4127c9da71b792ff64b","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jm/mergetool-pathspec' into pu\n\n* jm/mergetool-pathspec:\n  mergetool: no longer need to save standard input\n  mergetool: Use args as pathspec to unmerged files","Junio C Hamano"],["42b1e61944696921f3cba1e1eca03ead38534256","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jh/receive-count-limit' into pu\n\n* jh/receive-count-limit:\n  receive-pack: Allow server to refuse pushes with too many objects\n  pack-objects: Estimate pack size; abort early if pack size limit is exceeded\n  send-pack/receive-pack: Allow server to refuse pushing too large packs\n  pack-objects: Allow --max-pack-size to be used together with --stdout\n  send-pack/receive-pack: Allow server to refuse pushes with too many commits\n  pack-objects: Teach new option --max-commit-count, limiting #commits in pack\n  receive-pack: Prepare for addition of the new 'limit-*' family of capabilities\n  Tighten rules for matching server capabilities in server_supports()\n  send-pack: Attempt to retrieve remote status even if pack-objects fails\n  Update technical docs to reflect side-band-64k capability in receive-pack\n\nConflicts:\n\tbuiltin/pack-objects.c","Junio C Hamano"],["9e8d6ac56a9e687a582e22af9f7da727006c5a52","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'sr/transport-helper-fix-rfc' into pu\n\n* sr/transport-helper-fix-rfc:\n  t5800: point out that deleting branches does not work\n  t5800: document inability to push new branch with old content","Junio C Hamano"],["07e1f8868a27270f22957020f49ffc8c9ad7b419","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'po/cygwin-backslash' into pu\n\n* po/cygwin-backslash:\n  On Cygwin support both UNIX and DOS style path-names\n  git-compat-util: add generic find_last_dir_sep that respects is_dir_sep","Junio C Hamano"],["37f07fb531a795c1401dc80b1c18a5be8c172046","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mh/iterate-refs' into pu\n\n* mh/iterate-refs:\n  refs.c: make create_cached_refs() static\n  Retain caches of submodule refs\n  Store the submodule name in struct cached_refs\n  Allocate cached_refs objects dynamically\n  Change the signature of read_packed_refs()\n  Access reference caches only through new function get_cached_refs()\n  Extract a function clear_cached_refs()","Junio C Hamano"],["9c997845a40e97675e2352303b34eacf80063549","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'hv/submodule-merge-search' into pu\n\n* hv/submodule-merge-search:\n  submodule: Search for merges only at end of recursive merge\n  allow multiple calls to submodule merge search for the same path\n  submodule: Demonstrate known breakage during recursive merge\n  push: Don't push a repository with unpushed submodules","Junio C Hamano"],["4a4f2b94ed1d493380184e31d664ebe3a9134eb4","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'nd/maint-autofix-tag-in-head' into pu\n\n* nd/maint-autofix-tag-in-head:\n  Accept tags in HEAD or MERGE_HEAD\n  merge: remove global variable head[]\n  merge: use return value of resolve_ref() to determine if HEAD is invalid\n  merge: keep stash[] a local variable\n\nConflicts:\n\tbuiltin/merge.c","Junio C Hamano"],["22dc509d184913dd90d6e957259dc5db7e2584ed","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/default-attr' into pu\n\n* jk/default-attr:\n  attr: map builtin userdiff drivers to well-known extensions","Junio C Hamano"],["e3704060fca8c153792fd41b4dbd0019bd8bf10a","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/generation-numbers' into pu\n\n* jk/generation-numbers:\n  metadata-cache.c: make two functions static\n  limit \"contains\" traversals based on commit generation\n  check commit generation cache validity against grafts\n  pretty: support %G to show the generation number of a commit\n  commit: add commit_generation function\n  add metadata-cache infrastructure\n  decorate: allow storing values instead of pointers\n\nConflicts:\n\tcache.h\n\tcommit.c","Junio C Hamano"],["971226fce026c6bfdd1eb8f25e10428477797bb0","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'rj/maint-t9159-svn-rev-notation' into pu\n\n* rj/maint-t9159-svn-rev-notation:\n  t9159-*.sh: skip for mergeinfo test for svn <= 1.4","Junio C Hamano"],["85e5e3e82b4ccabf2c5971e83db1fb7e9da4f3bb","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mz/remote-rename' into pu\n\n* mz/remote-rename:\n  remote: only update remote-tracking branch if updating refspec\n  remote rename: warn when refspec was not updated\n  remote: \"rename o foo\" should not rename ref \"origin/bar\"\n  remote: write correct fetch spec when renaming remote 'remote'","Junio C Hamano"],["6aa4ffe169149a584b3786b8212eecbc44327de2","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'bc/attr-ignore-case' into pu\n\n* bc/attr-ignore-case:\n  attr: read core.attributesfile from git_default_core_config\n  attr.c: respect core.ignorecase when matching attribute patterns\n  builtin/mv.c: plug miniscule memory leak\n  cleanup: use internal memory allocation wrapper functions everywhere\n  attr.c: avoid inappropriate access to strbuf \"buf\" member","Junio C Hamano"],["add57b372e003f5001ab50863b00eff2c7a59b43","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'js/cred-macos-x-keychain-2' into pu\n\n* js/cred-macos-x-keychain-2:\n  contrib: add a pair of credential helpers for Mac OS X's keychain","Junio C Hamano"],["c6fb2c120ba5d75c79892ffb30625658f6d54801","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/signed-push' into pu\n\n* jc/signed-push:\n  push -s: support pre-receive-signature hook\n  push -s: receiving end\n  push -s: send signed push certificate\n  push -s: skeleton\n  Split GPG interface into its own helper library\n  rename \"match_refs()\" to \"match_push_refs()\"\n  send-pack: typofix error message\n\nConflicts:\n\tbuiltin/receive-pack.c\n\tbuiltin/send-pack.c\n\ttransport.h","Junio C Hamano"],["c101de3467be78d91cfff39216b9966c589af549","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'bw/grep-no-index-no-exclude' into pu\n\n* bw/grep-no-index-no-exclude:\n  grep --no-index: don't use git standard exclusions\n  grep: do not use --index in the short usage output","Junio C Hamano"],["02aaa43c628529b513374e59bc9514db7aed0501","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/want-commit' into pu\n\n* jc/want-commit:\n  Allow git merge \":/<pattern>\"","Junio C Hamano"],["761e80b804f36dfcfc625b7862b4a396328aaa51","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/namespace-doc-with-old-asciidoc' into pu\n\n* jc/namespace-doc-with-old-asciidoc:\n  Documentation/gitnamespaces.txt: cater to older asciidoc","Junio C Hamano"],["40d72268589e98acacee3b4cb96daa26bec69ffb","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jn/gitweb-highlite-sanitise' into pu\n\n* jn/gitweb-highlite-sanitise:\n  gitweb: Strip non-printable characters from syntax highlighter output","Junio C Hamano"],["a4698ad2613e3278836bdffcb62ad9b5244e86b3","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mh/check-ref-format-3' into pu\n\n* mh/check-ref-format-3: (22 commits)\n  add_ref(): verify that the refname is formatted correctly\n  resolve_ref(): expand documentation\n  resolve_ref(): also treat a too-long SHA1 as invalid\n  resolve_ref(): emit warnings for improperly-formatted references\n  resolve_ref(): verify that the input refname has the right format\n  remote: avoid passing NULL to read_ref()\n  remote: use xstrdup() instead of strdup()\n  resolve_ref(): do not follow incorrectly-formatted symbolic refs\n  resolve_ref(): extract a function get_packed_ref()\n  resolve_ref(): turn buffer into a proper string as soon as possible\n  resolve_ref(): only follow a symlink that contains a valid, normalized refname\n  resolve_ref(): use prefixcmp()\n  resolve_ref(): explicitly fail if a symlink is not readable\n  Change check_refname_format() to reject unnormalized refnames\n  Inline function refname_format_print()\n  Make collapse_slashes() allocate memory for its result\n  Do not allow \".lock\" at the end of any refname component\n  Refactor check_refname_format()\n  Change check_ref_format() to take a flags argument\n  Change bad_ref_char() to return a boolean value\n  ...\n\nConflicts:\n\ttransport-helper.c","Junio C Hamano"]],"ref":"refs/heads/pu","size":31,"head":"1bb20de3e6ff4b319391d382466f102f91533d4f","push_id":43827093}