{"push_id":982043045,"size":76,"distinct_size":58,"ref":"refs/heads/pu","head":"b3d5bb6346867b68227b959d0a4b269e7f3bcd15","before":"c8a29821dbb08a12a32face9789f0002caefb7e0","commits":[{"sha":"8dc874b2ee61f0c457c4482ed2f202cac55b52ad","author":{"email":"5b1aa8048ca15eb13769ec53de5782168f5fdb45@cox.net","name":"Stephen P. Smith"},"message":"wt-status.c: set commitable bit if there is a meaningful merge.\n\nThe 'commit --dry-run' and 'commit' return values differed if a\nconflicted merge had been resolved and the resulting commit would\nrecord the same tree as the parent.\n\nUpdate show_merge_in_progress to set the commitable bit if conflicts\nhave been resolved and a merge is in progress.\n\nSigned-off-by: Stephen P. Smith <ischis2@cox.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/git/git/commits/8dc874b2ee61f0c457c4482ed2f202cac55b52ad"},{"sha":"3e3a4a41b0dac564c0302ced4ccc423d0d39bc21","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"pager: factor out a helper to prepare a child process to run the pager\n\nWhen running a pager, we need to run the program git_pager() gave\nus, but we need to make sure we spawn it via the shell (i.e. it is\nvalid to say PAGER='less -S', for example) and give default values\nto $LESS and $LV environment variables.  Factor out these details\nto a separate helper function.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/git/git/commits/3e3a4a41b0dac564c0302ced4ccc423d0d39bc21"},{"sha":"708b8cc9a114ea1e5b90f5f52fd24ecade4e8b40","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"am -i: fix \"v\"iew\n\nThe 'v'iew subcommand of the interactive mode of \"git am -i\" was\nbroken by the rewrite to C we did at around 2.6.0 timeframe at\n7ff26832 (builtin-am: implement -i/--interactive, 2015-08-04); we\nused to spawn the pager via the shell, accepting things like\n\n\tPAGER='less -S'\n\nin the environment, but the rewrite forgot and tried to directly\nspawn a command whose name is the entire string.\n\nThe previous refactoring of the new helper function makes it easier\nfor us to do the right thing.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/git/git/commits/708b8cc9a114ea1e5b90f5f52fd24ecade4e8b40"},{"sha":"d8ff76cf17c334c60cb83e7d860466086d0547fe","author":{"email":"b4cf3b77c95aaa57254d96e276bf14cfc9472402@gmx.de","name":"Johannes Schindelin"},"message":"t5505: 'remote add x y' should work when url.y.insteadOf = x\n\nThis is the test missing from fb86e32 (git remote: allow adding\nremotes agreeing with url.<...>.insteadOf, 2014-12-23): we should\nallow adding a remote with the URL when it agrees with the\nurl.<...>.insteadOf setting.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/git/git/commits/d8ff76cf17c334c60cb83e7d860466086d0547fe"},{"sha":"527d4a638e330f4efe459442bbfb0799d29fd73a","author":{"email":"f1f1725d333c133515b6481598f087dc0ac0f180@gmail.com","name":"GyuYong Jung"},"message":"git-cvsserver.perl: fix typo\n\nSigned-off-by: GyuYong Jung <obliviscence@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/git/git/commits/527d4a638e330f4efe459442bbfb0799d29fd73a"},{"sha":"ab2c107eab77a7879574992752a3ac96421bef34","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'js/xmerge-marker-eol' into maint\n\nThe low-level merge machinery has been taught to use CRLF line\ntermination when inserting conflict markers to merged contents that\nare themselves CRLF line-terminated.\n\n* js/xmerge-marker-eol:\n  merge-file: ensure that conflict sections match eol style\n  merge-file: let conflict markers match end-of-line style of the context","distinct":false,"url":"https://api.github.com/repos/git/git/commits/ab2c107eab77a7879574992752a3ac96421bef34"},{"sha":"88221d92cbc21f629b60eb046e5aabd6cdc67cca","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'nd/do-not-move-worktree-manually' into maint\n\n\"git worktree\" had a broken code that attempted to auto-fix\npossible inconsistency that results from end-users moving a\nworktree to different places without telling Git (the original\nrepository needs to maintain backpointers to its worktrees, but\n\"mv\" run by end-users who are not familiar with that fact will\nobviously not adjust them), which actually made things worse\nwhen triggered.\n\n* nd/do-not-move-worktree-manually:\n  worktree: stop supporting moving worktrees manually\n  worktree.c: fix indentation","distinct":false,"url":"https://api.github.com/repos/git/git/commits/88221d92cbc21f629b60eb046e5aabd6cdc67cca"},{"sha":"0eefe108ec2a946e40072caf58c52e3b7f573e52","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'aw/push-force-with-lease-reporting' into maint\n\n\"git push --force-with-lease\" has been taught to report if the push\nneeded to force (or fast-forwarded).\n\n* aw/push-force-with-lease-reporting:\n  push: fix ref status reporting for --force-with-lease","distinct":false,"url":"https://api.github.com/repos/git/git/commits/0eefe108ec2a946e40072caf58c52e3b7f573e52"},{"sha":"7516977b4adc38937d95d8c7da8944153784bf9a","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'js/test-lib-windows-emulated-yes' into maint\n\nThe emulated \"yes\" command used in our test scripts has been\ntweaked not to spend too much time generating unnecessary output\nthat is not used, to help those who test on Windows where it would\nnot stop until it fills the pipe buffer due to lack of SIGPIPE.\n\n* js/test-lib-windows-emulated-yes:\n  test-lib: limit the output of the yes utility","distinct":false,"url":"https://api.github.com/repos/git/git/commits/7516977b4adc38937d95d8c7da8944153784bf9a"},{"sha":"8a71d90b7e6bcf88232e34c77560dd3d0b334247","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Start preparing for 2.7.2\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/git/git/commits/8a71d90b7e6bcf88232e34c77560dd3d0b334247"},{"sha":"9f03176ef679ea5e0fb9088529180db72ae0764b","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/drop-rsync-transport'\n\nIt turns out \"git clone\" over rsync transport has been broken when\nthe source repository has packed references for a long time, and\nnobody noticed nor complained about it.\n\n* jk/drop-rsync-transport:\n  transport: drop support for git-over-rsync","distinct":false,"url":"https://api.github.com/repos/git/git/commits/9f03176ef679ea5e0fb9088529180db72ae0764b"},{"sha":"4b589e5b28af077ddbdd5b72b6217c7447d45cb5","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'js/mingw-tests'\n\nTest scripts have been updated to remove assumptions that are not\nportable between Git for POSIX and Git for Windows, or to skip ones\nwith expectations that are not satisfiable on Git for Windows.\n\n* js/mingw-tests: (21 commits)\n  gitignore: ignore generated test-fake-ssh executable\n  mingw: do not bother to test funny file names\n  mingw: skip a test in t9130 that cannot pass on Windows\n  mingw: handle the missing POSIXPERM prereq in t9124\n  mingw: avoid illegal filename in t9118\n  mingw: mark t9100's test cases with appropriate prereqs\n  t0008: avoid absolute path\n  mingw: work around pwd issues in the tests\n  mingw: fix t9700's assumption about directory separators\n  mingw: skip test in t1508 that fails due to path conversion\n  tests: turn off git-daemon tests if FIFOs are not available\n  mingw: disable mkfifo-based tests\n  mingw: accomodate t0060-path-utils for MSYS2\n  mingw: fix t5601-clone.sh\n  mingw: let lstat() fail with errno == ENOTDIR when appropriate\n  mingw: try to delete target directory before renaming\n  mingw: prepare the TMPDIR environment variable for shell scripts\n  mingw: factor out Windows specific environment setup\n  Git.pm: stop assuming that absolute paths start with a slash\n  mingw: do not trust MSYS2's MinGW gettext.sh\n  ...","distinct":false,"url":"https://api.github.com/repos/git/git/commits/4b589e5b28af077ddbdd5b72b6217c7447d45cb5"},{"sha":"f60ccdd98c3f1183922b43478b629049408849ff","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'mg/mingw-test-fix'\n\nAn earlier adjustment of test mistakenly used write_script\nto prepare a file whose exact content matters for the test;\nreverting that part fixes the breakage for those who use\nSHELL_PATH that is different from /bin/sh.\n\n* mg/mingw-test-fix:\n  t9100: fix breakage when SHELL_PATH is not /bin/sh","distinct":false,"url":"https://api.github.com/repos/git/git/commits/f60ccdd98c3f1183922b43478b629049408849ff"},{"sha":"dbda66b0e283494c35958316c9b1c47b6e6c9f59","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'nd/clear-gitenv-upon-use-of-alias'\n\nThe automatic typo correction applied to an alias was broken\nwith a recent change already in 'master'.\n\n* nd/clear-gitenv-upon-use-of-alias:\n  restore_env(): free the saved environment variable once we are done\n  git: simplify environment save/restore logic\n  git: protect against unbalanced calls to {save,restore}_env()\n  git: remove an early return from save_env_before_alias()","distinct":false,"url":"https://api.github.com/repos/git/git/commits/dbda66b0e283494c35958316c9b1c47b6e6c9f59"},{"sha":"c37f9a1bc38cad56c9eca40014802e7cd822c21c","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'da/user-useconfigonly'\n\nThe \"user.useConfigOnly\" configuration variable can be used to\nforce the user to always set user.email & user.name configuration\nvariables, serving as a reminder for those who work on multiple\nprojects and do not want to put these in their $HOME/.gitconfig.\n\n* da/user-useconfigonly:\n  ident: add user.useConfigOnly boolean for when ident shouldn't be guessed\n  fmt_ident: refactor strictness checks","distinct":false,"url":"https://api.github.com/repos/git/git/commits/c37f9a1bc38cad56c9eca40014802e7cd822c21c"},{"sha":"790dd332c6986693b731211e49479c74c8a1894c","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/test-path-utils-xsnprintf'\n\nSome calls to strcpy(3) triggers a false warning from static\nanalysers that are less intelligent than humans, and reducing the\nnumber of these false hits helps us notice real issues.  A few\ncalls to strcpy(3) in test-path-utils that are already safe has\nbeen rewritten to avoid false wanings.\n\n* jk/test-path-utils-xsnprintf:\n  test-path-utils: use xsnprintf in favor of strcpy","distinct":false,"url":"https://api.github.com/repos/git/git/commits/790dd332c6986693b731211e49479c74c8a1894c"},{"sha":"b1a90b68cfa3f9e1e0769c2c9fe0db012a51c818","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/rerere-xsnprintf'\n\nSome calls to strcpy(3) triggers a false warning from static\nanalysers that are less intelligent than humans, and reducing the\nnumber of these false hits helps us notice real issues.  A few\ncalls to strcpy(3) in \"git rerere\" that are already safe has been\nrewritten to avoid false wanings.\n\n* jk/rerere-xsnprintf:\n  rerere: replace strcpy with xsnprintf","distinct":false,"url":"https://api.github.com/repos/git/git/commits/b1a90b68cfa3f9e1e0769c2c9fe0db012a51c818"},{"sha":"8c7124c9ac3797b4880bba9f1bae3436672ac31e","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'mm/clean-doc-fix'\n\nThe documentation for \"git clean\" has been corrected; it mentioned\nthat .git/modules/* are removed by giving two \"-f\", which has never\nbeen the case.\n\n* mm/clean-doc-fix:\n  Documentation/git-clean.txt: don't mention deletion of .git/modules/*","distinct":false,"url":"https://api.github.com/repos/git/git/commits/8c7124c9ac3797b4880bba9f1bae3436672ac31e"},{"sha":"d6a5088f6744e0fe19ed1a43700f400b334705f4","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'ah/stripspace-optstring'\n\n* ah/stripspace-optstring:\n  stripspace: call U+0020 a \"space\" instead of a \"blank\"","distinct":false,"url":"https://api.github.com/repos/git/git/commits/d6a5088f6744e0fe19ed1a43700f400b334705f4"},{"sha":"82c17b7a9ae1c78ce4891ad272f78fd2cd181ded","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'dw/mergetool-vim-window-shuffle'\n\nThe vimdiff backend for \"git mergetool\" has been tweaked to arrange\nand number buffers in the order that would match the expectation of\nmajority of people who read left to right, then top down and assign\nbuffers 1 2 3 4 \"mentally\" to local base remote merge windows based\non that order.\n\n* dw/mergetool-vim-window-shuffle:\n  mergetool: reorder vim/gvim buffers in three-way diffs","distinct":false,"url":"https://api.github.com/repos/git/git/commits/82c17b7a9ae1c78ce4891ad272f78fd2cd181ded"}]}