{"push_id":615890410,"size":26,"distinct_size":26,"ref":"refs/heads/pu","head":"3dd3cedd9f95bb8dd9d9ff7bbb9da57187a10305","before":"8d204253d6d14d9e547e0bcb68edc84d4915ad8d","commits":[{"sha":"c8819eeabbb40b7d120f06c0d11322ecdbd570ac","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'ss/pull-rebase-preserve' into jch\n\n* ss/pull-rebase-preserve:\n  docs: clarify \"preserve\" option wording for git-pull","distinct":true,"url":"https://api.github.com/repos/git/git/commits/c8819eeabbb40b7d120f06c0d11322ecdbd570ac"},{"sha":"3310fc021c8c7a71050b67cba0f0c1209353d40c","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'ph/push-doc-cas' into jch\n\n* ph/push-doc-cas:\n  git-push.txt: clean up force-with-lease wording","distinct":true,"url":"https://api.github.com/repos/git/git/commits/3310fc021c8c7a71050b67cba0f0c1209353d40c"},{"sha":"b3ca868c661f1639badc33ee4eb3c8295124be11","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"###","distinct":true,"url":"https://api.github.com/repos/git/git/commits/b3ca868c661f1639badc33ee4eb3c8295124be11"},{"sha":"cca9c9d7686f067ddd80ff409c8cbce9c583582f","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'nd/multiple-work-trees' into jch\n\nA replacement for contrib/workdir/git-new-workdir that does not\nrely on symbolic links and make sharing of objects and refs safer\nby making the borrowee and borrowers aware of each other.\n\n* nd/multiple-work-trees: (40 commits)\n  t1501: fix test with split index\n  t2026: fix broken &&-chain\n  t2026 needs procondition SANITY\n  git-checkout.txt: a note about multiple checkout support for submodules\n  checkout: add --ignore-other-wortrees\n  checkout: pass whole struct to parse_branchname_arg instead of individual flags\n  git-common-dir: make \"modules/\" per-working-directory directory\n  checkout: do not fail if target is an empty directory\n  t2025: add a test to make sure grafts is working from a linked checkout\n  checkout: don't require a work tree when checking out into a new one\n  git_path(): keep \"info/sparse-checkout\" per work-tree\n  count-objects: report unused files in $GIT_DIR/worktrees/...\n  gc: support prune --worktrees\n  gc: factor out gc.pruneexpire parsing code\n  gc: style change -- no SP before closing parenthesis\n  checkout: clean up half-prepared directories in --to mode\n  checkout: reject if the branch is already checked out elsewhere\n  prune: strategies for linked checkouts\n  checkout: support checking out into a new working directory\n  use new wrapper write_file() for simple file writing\n  ...","distinct":true,"url":"https://api.github.com/repos/git/git/commits/cca9c9d7686f067ddd80ff409c8cbce9c583582f"},{"sha":"c488e1901f8a7c533cf01e31b70c97c9d31b8698","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'bc/object-id' into jch\n\nIdentify parts of the code that knows that we use SHA-1 hash to\nname our objects too much, and use (1) symbolic constants instead\nof hardcoded 20 as byte count and/or (2) use struct object_id\ninstead of unsigned char [20] for object names.\n\nAlso waiting for reviews on the follow-up series ($gmane/265939)\nthat seems to have seen no interest X-<.\n\n* bc/object-id:\n  apply: convert threeway_stage to object_id\n  patch-id: convert to use struct object_id\n  commit: convert parts to struct object_id\n  diff: convert struct combine_diff_path to object_id\n  bulk-checkin.c: convert to use struct object_id\n  zip: use GIT_SHA1_HEXSZ for trailers\n  archive.c: convert to use struct object_id\n  bisect.c: convert leaf functions to use struct object_id\n  define utility functions for object IDs\n  define a structure for object IDs","distinct":true,"url":"https://api.github.com/repos/git/git/commits/c488e1901f8a7c533cf01e31b70c97c9d31b8698"},{"sha":"685f52bb394dab3faf4a3191dbecc1ee514bae6e","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'pt/credential-xdg' into jch\n\nTweak the sample \"store\" backend of the credential helper to honor\nXDG configuration file locations when specified.\n\nAs this may see further updates, and also this is not an urgent\nissue anyway, I'll give it a bit more time for it to simmer.\n\n* pt/credential-xdg:\n  t0302: \"unreadable\" test needs POSIXPERM\n  t0302: test credential-store support for XDG_CONFIG_HOME\n  git-credential-store: support XDG_CONFIG_HOME\n  git-credential-store: support multiple credential files","distinct":true,"url":"https://api.github.com/repos/git/git/commits/685f52bb394dab3faf4a3191dbecc1ee514bae6e"},{"sha":"307c8e4db4a5f586b09aeb6ae7a8fbf6d9a50798","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'nd/diff-i-t-a' into jch\n\nAfter \"git add -N\", the path appeared in output of \"git diff HEAD\"\nand \"git diff --cached HEAD\", leading \"git status\" to classify it\nas \"Changes to be committed\".  Such a path, however, is not yet to\nbe scheduled to be committed.  \"git diff\" showed the change to the\npath as modification, not as a \"new file\", in the header of its\noutput.\n\nTreat such paths as \"yet to be added to the index but Git already\nknow about them\"; \"git diff HEAD\" and \"git diff --cached HEAD\"\nshould not talk about them, and \"git diff\" should show them as new\nfiles yet to be added to the index.\n\n* nd/diff-i-t-a:\n  diff-lib.c: adjust position of i-t-a entries in diff","distinct":true,"url":"https://api.github.com/repos/git/git/commits/307c8e4db4a5f586b09aeb6ae7a8fbf6d9a50798"},{"sha":"f78f7966dfad40b4b04eebf0c7b2b080ea8197cb","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jc/diff-no-index-d-f' into jch\n\nThe usual \"git diff\" when seeing a file turning into a directory\nshowed a patchset to remove the file and create all files in the\ndirectory, but \"git diff --no-index\" simply refused to work.  Also,\nwhen asked to compare a file and a directory, imitate POSIX \"diff\"\nand compare the file with the file with the same name in the\ndirectory, instead of refusing to run.\n\n* jc/diff-no-index-d-f:\n  diff-no-index: align D/F handling with that of normal Git\n  diff-no-index: DWIM \"diff D F\" into \"diff D/F F\"","distinct":true,"url":"https://api.github.com/repos/git/git/commits/f78f7966dfad40b4b04eebf0c7b2b080ea8197cb"},{"sha":"df5303893747ae99b5dab65c6ee28e21c266defc","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"### match next","distinct":true,"url":"https://api.github.com/repos/git/git/commits/df5303893747ae99b5dab65c6ee28e21c266defc"},{"sha":"3c045479370c815bcaac5f7ced33284e7d0a7ff4","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'nd/slim-index-pack-memory-usage' into jch\n\nMemory usage of \"git index-pack\" has been trimmed by tens of\nper-cent.\n\n* nd/slim-index-pack-memory-usage:\n  index-pack: kill union delta_base to save memory\n  index-pack: reduce object_entry size to save memory","distinct":true,"url":"https://api.github.com/repos/git/git/commits/3c045479370c815bcaac5f7ced33284e7d0a7ff4"},{"sha":"110c18758270f73bce9b9cc56869df94db046967","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'mh/fdopen-with-retry' into jch\n\nVarious parts of the code where they call fdopen() can fail when\nthey run out of memory; attempt to proceed by retrying the\noperation after freeing some resource.\n\n* mh/fdopen-with-retry:\n  buffer_fdinit(): use fdopen_with_retry()\n  update_info_file(): use fdopen_with_retry()\n  copy_to_log(): use fdopen_with_retry()\n  fdopen_lock_file(): use fdopen_with_retry()\n  SQUASH??? $gmane/264889\n  xfdopen(): if first attempt fails, free memory and try again","distinct":true,"url":"https://api.github.com/repos/git/git/commits/110c18758270f73bce9b9cc56869df94db046967"},{"sha":"c150ef6f28860d1850a7585d370aed7ce1e9296e","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'nd/untracked-cache' into jch\n\n* nd/untracked-cache: (24 commits)\n  git-status.txt: advertisement for untracked cache\n  untracked cache: guard and disable on system changes\n  mingw32: add uname()\n  t7063: tests for untracked cache\n  update-index: test the system before enabling untracked cache\n  update-index: manually enable or disable untracked cache\n  status: enable untracked cache\n  untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHE\n  untracked cache: mark index dirty if untracked cache is updated\n  untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS\n  untracked cache: avoid racy timestamps\n  read-cache.c: split racy stat test to a separate function\n  untracked cache: invalidate at index addition or removal\n  untracked cache: load from UNTR index extension\n  untracked cache: save to an index extension\n  ewah: add convenient wrapper ewah_serialize_strbuf()\n  untracked cache: don't open non-existent .gitignore\n  untracked cache: mark what dirs should be recursed/saved\n  untracked cache: record/validate dir mtime and reuse cached output\n  untracked cache: make a wrapper around {open,read,close}dir()\n  ...","distinct":true,"url":"https://api.github.com/repos/git/git/commits/c150ef6f28860d1850a7585d370aed7ce1e9296e"},{"sha":"11f850222eff6d68738f8241731cb6cb7790aa75","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'as/userdiff-sh' into jch\n\nAdd a built-in \"userdiff\" patterns to word-split and identify\nnotable lines in shell scripts to help presentation of diff and\ngrep output.\n\n* as/userdiff-sh:\n  userdiff: funcname and word patterns for sh","distinct":true,"url":"https://api.github.com/repos/git/git/commits/11f850222eff6d68738f8241731cb6cb7790aa75"},{"sha":"83d721a8de2584d279184a838bfad14e11c547c2","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jc/a-lone-dash-stands-for-previous-branch' into jch\n\nLose special case code to make a lone dash \"-\" mean the previous\nbranch aka \"@{-1}\" from a handful subcommands, and instead support\nthe notation throughout the system by reimplementing it at the\nrevisions layer.\n\njob dealing with range notation, which needs to be fixed before the\nseries goes anywhere.\n\n* jc/a-lone-dash-stands-for-previous-branch:\n  \"-\" and \"@{-1}\" on various programs","distinct":true,"url":"https://api.github.com/repos/git/git/commits/83d721a8de2584d279184a838bfad14e11c547c2"},{"sha":"e4eecf98d3453aa9c5ae35af2263ee8f760ac0c8","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'tf/gitweb-project-listing' into jch\n\nUpdate gitweb to make it more pleasant to deal with a hierarchical\nforest of repositories.\n\nAny comments from those who use or have their own code in Gitweb?\n\n* tf/gitweb-project-listing:\n  gitweb: make category headings into links when they are directories\n  gitweb: optionally set project category from its pathname\n  gitweb: add a link under the search box to clear a project filter\n  gitweb: if the PATH_INFO is incomplete, use it as a project_filter\n  gitweb: fix typo in man page","distinct":true,"url":"https://api.github.com/repos/git/git/commits/e4eecf98d3453aa9c5ae35af2263ee8f760ac0c8"},{"sha":"ffdd7959a516f9ba002530c06deabc2ed4984327","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jc/merge-deprecate-old-syntax' into jch\n\nAn RFC to really start the process of removing the ancient syntax\nto invoke a two-way merge, which has been deprecated since October\n2007.\n\n* jc/merge-deprecate-old-syntax:\n  merge: deprecate 'git merge <message> HEAD <commit>' syntax","distinct":true,"url":"https://api.github.com/repos/git/git/commits/ffdd7959a516f9ba002530c06deabc2ed4984327"},{"sha":"e68f51938c383b8d48440f15d9b6c5c823c77408","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jc/merge-drop-old-syntax' into pu\n\n* jc/merge-drop-old-syntax:\n  merge: drop 'git merge <message> HEAD <commit>' syntax","distinct":true,"url":"https://api.github.com/repos/git/git/commits/e68f51938c383b8d48440f15d9b6c5c823c77408"},{"sha":"1d4958b8f8ec6df3991b02b03827e419aa92013c","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'tr/remerge-diff' into pu\n\n\"log -p\" output learns a new way to let users inspect a merge\ncommit by showing the differences between the automerged result\nwith conflicts the person who recorded the merge would have seen\nand the final conflict resolution that was recorded in the merge.\n\n* tr/remerge-diff:\n  t4213: avoid \"|\" in sed regexp\n  log --remerge-diff: show what the conflict resolution changed\n  name-hash: allow dir hashing even when !ignore_case\n  merge-recursive: allow storing conflict hunks in index\n  merge_diff_mode: fold all merge diff variants into an enum\n  combine-diff: do not pass revs->dense_combined_merges redundantly\n  merge-recursive: -Xindex-only to leave worktree unchanged\n  merge-recursive: internal flag to avoid touching the worktree\n  merge-recursive: remove dead conditional in update_stages()","distinct":true,"url":"https://api.github.com/repos/git/git/commits/1d4958b8f8ec6df3991b02b03827e419aa92013c"},{"sha":"70a985e1b51853ddc1242d8fc90efc29d6ddf404","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'nd/list-files' into pu\n\nA new \"git list-files\" Porcelain command, \"ls-files\" with bells and\nwhistles.\n\nReroll to base on wt-status work ($gmane/265142) has seen some\npositive discussions.\n\n* nd/list-files: (21 commits)\n  t3080: tests for git-list-files\n  list-files: -M aka diff-cached\n  list-files -F: show submodules with the new indicator '&'\n  list-files: add -F/--classify\n  list-files: show directories as well as files\n  list-files: do not show duplicate cached entries\n  list-files: sort output and remove duplicates\n  list-files: add -t back\n  list-files: add -1 short for --no-column\n  list-files: add -R/--recursive short for --max-depth=-1\n  list-files: -u does not imply showing stages\n  list-files: make alias 'ls' default to 'list-files'\n  list-files: a user friendly version of ls-files and more\n  ls-files: support --max-depth\n  ls-files: add --column\n  ls-files: add --color to highlight file names\n  ls-files: buffer full item in strbuf before printing\n  ls_colors.c: highlight submodules like directories\n  ls_colors.c: add a function to color a file name\n  ls_colors.c: parse color.ls.* from config file\n  ...","distinct":true,"url":"https://api.github.com/repos/git/git/commits/70a985e1b51853ddc1242d8fc90efc29d6ddf404"},{"sha":"37ddd26ef09760b615e2a46492959c9b669c453a","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'mh/numparse' into pu\n\nMany codepaths use unchecked use of strtol() and friends (or even\nworse, atoi()).  Introduce a set of wrappers that try to be more\ncareful.\n\n* mh/numparse:\n  diff_opt_parse(): use convert_i() when handling --abbrev=<num>\n  diff_opt_parse(): use convert_i() when handling \"-l<num>\"\n  opt_arg(): simplify pointer handling\n  opt_arg(): report errors parsing option values\n  opt_arg(): use convert_i() in implementation\n  opt_arg(): val is always non-NULL\n  builtin_diff(): detect errors when parsing --unified argument\n  handle_revision_opt(): use convert_ui() when handling \"--abbrev=\"\n  strtoul_ui(), strtol_i(): remove functions\n  handle_revision_opt(): use convert_i() when handling \"-<digit>\"\n  handle_revision_opt(): use skip_prefix() in many places\n  write_subdirectory(): use convert_ui() for parsing mode\n  cacheinfo_callback(): use convert_ui() when handling \"--cacheinfo\"\n  numparse: new module for parsing integral numbers","distinct":true,"url":"https://api.github.com/repos/git/git/commits/37ddd26ef09760b615e2a46492959c9b669c453a"}]}