{"shas":[["ed2c1bcc2552d68f44ccda82f77e300998d7e737","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'ab/i18n-scripts' into jch\n\n* ab/i18n-scripts: (48 commits)\n  i18n: git-bisect bisect_next_check \"You need to\" message\n  i18n: git-bisect [Y/n] messages\n  i18n: git-bisect bisect_replay + $1 messages\n  i18n: git-bisect bisect_reset + $1 messages\n  i18n: git-bisect bisect_run + $@ messages\n  i18n: git-bisect die + eval_gettext messages\n  i18n: git-bisect die + gettext messages\n  i18n: git-bisect echo + eval_gettext message\n  i18n: git-bisect echo + gettext messages\n  i18n: git-bisect gettext + echo message\n  i18n: git-bisect add git-sh-i18n\n  i18n: git-stash drop_stash say/die messages\n  i18n: git-stash \"unknown option\" message\n  i18n: git-stash die + eval_gettext $1 messages\n  i18n: git-stash die + eval_gettext $* messages\n  i18n: git-stash die + eval_gettext messages\n  i18n: git-stash die + gettext messages\n  i18n: git-stash say + gettext messages\n  i18n: git-stash echo + gettext message\n  i18n: git-stash add git-sh-i18n\n  ...","Junio C Hamano"],["c0256979d5e222212020b41c748dec8116e89928","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/streaming' into jch\n\n* jc/streaming:\n  sha1_file: use the correct type (ssize_t, not size_t) for read-style function\n  streaming: read loose objects incrementally\n  sha1_file.c: expose helpers to read loose objects\n  streaming: read non-delta incrementally from a pack\n  streaming_write_entry(): support files with holes\n  convert: CRLF_INPUT is a no-op in the output codepath\n  streaming_write_entry(): use streaming API in write_entry()\n  streaming: a new API to read from the object store\n  write_entry(): separate two helper functions out\n  unpack_object_header(): make it public\n  sha1_object_info_extended(): hint about objects in delta-base cache\n  sha1_object_info_extended(): expose a bit more info\n  packed_object_info_detail(): do not return a string","Junio C Hamano"],["29efe5effb6c613e92a610d9e2f9f22b8f2cbc2c","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/combine-diff-binary-etc' into jch\n\n* jk/combine-diff-binary-etc:\n  combine-diff: respect textconv attributes\n  refactor get_textconv to not require diff_filespec\n  combine-diff: handle binary files as binary\n  combine-diff: calculate mode_differs earlier\n  combine-diff: split header printing into its own function","Junio C Hamano"],["f85b0e358687db3d772dc891cac8471be4eddeb9","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/advice-about-to-lose-commit' into jch\n\n* jc/advice-about-to-lose-commit:\n  checkout: make advice when reattaching the HEAD less loud\n\nConflicts:\n\tbuiltin/checkout.c","Junio C Hamano"],["e1158337a6fd0aaf1590f95cfaa03ecf3cfcf723","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'da/git-prefix-everywhere' into jch\n\n* da/git-prefix-everywhere:\n  git-mergetool--lib: Make vimdiff retain the current directory\n  git: Remove handling for GIT_PREFIX\n  setup: Provide GIT_PREFIX to built-ins","Junio C Hamano"],["d5cb985f74df90a18632f03c3df8868a50e86a3b","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mg/diff-stat-count' into jch\n\n* mg/diff-stat-count:\n  diff --stat-count: finishing touches\n  diff-options.txt: describe --stat-{width,name-width,count}\n  diff: introduce --stat-lines to limit the stat lines\n  diff.c: omit hidden entries from namelen calculation with --stat","Junio C Hamano"],["5b1e7378a4761503bc20a16df5dd800a4e6c91f4","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'bc/maint-status-z-to-use-porcelain' into jch\n\n* bc/maint-status-z-to-use-porcelain:\n  builtin/commit.c: set status_format _after_ option parsing\n  t7508: demonstrate status's failure to use --porcelain format with -z\n\nConflicts:\n\tbuiltin/commit.c","Junio C Hamano"],["5cd0a2e41a6ec7b5e9decdecbbbd830a96ec2031","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/diff-not-so-quick' into jch\n\n* jk/diff-not-so-quick:\n  diff: futureproof \"stop feeding the backend early\" logic\n  diff_tree: disable QUICK optimization with diff filter\n\nConflicts:\n\tdiff.c","Junio C Hamano"],["8f7ab28d42d99b7ee8ea0b4e2bb1743d3d23cf83","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/diff-index-quick-exit-early' into jch\n\n* jc/diff-index-quick-exit-early:\n  diff-index --quiet: learn the \"stop feeding the backend early\" logic\n\nConflicts:\n\tunpack-trees.h","Junio C Hamano"],["d322882429b7ab23bfd8052dd26f8637c9bc1138","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'ef/maint-win-verify-path' into jch\n\n* ef/maint-win-verify-path:\n  verify_path: consider dos drive prefix\n  real_path: do not assume '/' is the path seperator\n  A Windows path starting with a backslash is absolute","Junio C Hamano"],["c120850445d09969cf6b6703c875dc240cb39ecd","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jn/gitweb-js-blame' into jch\n\n* jn/gitweb-js-blame:\n  gitweb.js: use setTimeout rather than setInterval in blame_incremental.js\n  gitweb.js: No need for loop in blame_incremental's handleResponse()\n  gitweb.js: No need for inProgress in blame_incremental.js","Junio C Hamano"],["186ccdafa149c36e1cf444ebf5c440dead055b49","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/maint-merge-rename-create' into pu\n\n* jk/maint-merge-rename-create:\n  merge: turn on rewrite detection\n  merge: handle renames with replacement content\n  t3030: fix accidental success in symlink rename","Junio C Hamano"],["6413868a3878ff856d85894f5d07e570e213284e","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/tag-contains' into pu\n\n* jk/tag-contains:\n  Why is \"git tag --contains\" so slow?\n  default core.clockskew variable to one day\n  limit \"contains\" traversals based on commit timestamp\n  tag: speed up --contains calculation\n\nConflicts:\n\tcommit.h\n\tgit.c","Junio C Hamano"],["d2af491ff6b40ec2560c9cb6494455240d189f63","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/index-pack' into pu\n\n* jc/index-pack:\n  index-pack --verify: read anomalous offsets from v2 idx file\n  write_idx_file: need_large_offset() helper function\n  index-pack: --verify\n  write_idx_file: introduce a struct to hold idx customization options\n  index-pack: group the delta-base array entries also by type","Junio C Hamano"],["e1443be3b2c85d9ca6436cfe72faa339177b3e8a","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","Junio C Hamano"],["a78c7fbde8cf1e969eea6035bafab8166bef6042","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/streaming-filter' into pu\n\n* jc/streaming-filter:\n  t0021: test application of both crlf and ident\n  t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test\n  streaming: filter cascading\n  streaming filter: ident filter\n  Add LF-to-CRLF streaming conversion\n  stream filter: add \"no more input\" to the filters\n  Add streaming filter API\n  convert.h: move declarations for conversion from cache.h","Junio C Hamano"],["b4a5ea79988275f38f5d58d349864d31b0aa52a7","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/apply-nsbp' into pu\n\n* jc/apply-nsbp:\n  War on nbsp: teach \"git apply\" to check and fix nbsp\n  War on nbsp: Add \"nbsp\" whitespace breakage class\n  War on nbsp: a bit of retreat\n  ws.c: add a helper to format comma separated messages","Junio C Hamano"]],"ref":"refs/heads/pu","size":17,"head":"b4a5ea79988275f38f5d58d349864d31b0aa52a7","push_id":32881513}