{"push_id":1072539761,"size":8,"distinct_size":1,"ref":"refs/heads/jk/curl-auth-callback-wip","head":"b50be5c444d21fcabd5f704daa0f568070e10120","before":"53ba2c6b654f5ceb9442c02bdffd0a4ef2a4523f","commits":[{"sha":"2233066e778e32dfab0471ea2ad8d1c7a94b7e39","author":{"email":"13fbd79c3d390e5d6585a21e11ff5ec1970cff0c@rhe.jp","name":"Kazuki Yamaguchi"},"message":"refs: add a new function set_worktree_head_symref\n\nAdd a new function set_worktree_head_symref, to update HEAD symref for\nthe specified worktree.\n\nTo update HEAD of a linked working tree,\ncreate_symref(\"worktrees/$work_tree/HEAD\", \"refs/heads/$branch\", msg)\ncould be used. However when it comes to updating HEAD of the main\nworking tree, it is unusable because it uses $GIT_DIR for\nworktree-specific symrefs (HEAD).\n\nThe new function takes git_dir (real directory) as an argument, and\nupdates HEAD of the working tree. This function will be used when\nrenaming a branch.\n\nSigned-off-by: Kazuki Yamaguchi <k@rhe.jp>\nAcked-by: David Turner <dturner@twopensource.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/2233066e778e32dfab0471ea2ad8d1c7a94b7e39"},{"sha":"70999e9ceca47e03b8900bfb310b2f804125811e","author":{"email":"13fbd79c3d390e5d6585a21e11ff5ec1970cff0c@rhe.jp","name":"Kazuki Yamaguchi"},"message":"branch -m: update all per-worktree HEADs\n\nWhen renaming a branch, currently only the HEAD of current working tree\nis updated, but it must update HEADs of all working trees which point at\nthe old branch.\n\nThis is the current behavior, /path/to/wt's HEAD is not updated:\n\n  % git worktree list\n  /path/to     2c3c5f2 [master]\n  /path/to/wt  2c3c5f2 [oldname]\n  % git branch -m master master2\n  % git worktree list\n  /path/to     2c3c5f2 [master2]\n  /path/to/wt  2c3c5f2 [oldname]\n  % git branch -m oldname newname\n  % git worktree list\n  /path/to     2c3c5f2 [master2]\n  /path/to/wt  0000000 [oldname]\n\nThis patch fixes this issue by updating all relevant worktree HEADs\nwhen renaming a branch.\n\nSigned-off-by: Kazuki Yamaguchi <k@rhe.jp>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/70999e9ceca47e03b8900bfb310b2f804125811e"},{"sha":"95c38fb0ed45d9eb529afeb704b840818ba3da4d","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"branch: fix shortening of non-remote symrefs\n\nCommit aedcb7d (branch.c: use 'ref-filter' APIs, 2015-09-23)\nadjusted the symref-printing code to look like this:\n\n    if (item->symref) {\n\t    skip_prefix(item->symref, \"refs/remotes/\", &desc);\n\t    strbuf_addf(&out, \" -> %s\", desc);\n    }\n\nThis has three bugs in it:\n\n  1. It always skips past \"refs/remotes/\", instead of\n     skipping past the prefix associated with the branch we\n     are showing (so commonly we see \"refs/remotes/\" for the\n     refs/remotes/origin/HEAD symref, but the previous code\n     would skip \"refs/heads/\" when showing a symref it found\n     in refs/heads/.\n\n  2. If skip_prefix() does not match, it leaves \"desc\"\n     untouched, and we show whatever happened to be in it\n     (which is the refname from a call to skip_prefix()\n     earlier in the function).\n\n  3. If we do match with skip_prefix(), we stomp on the\n     \"desc\" variable, which is later passed to\n     add_verbose_info(). We probably want to retain the\n     original refname there (though it likely doesn't matter\n     in practice, since after all, one points to the other).\n\nThe fix to match the original code is fairly easy: record\nthe prefix to strip based on item->kind, and use it here.\nHowever, since we already have a local variable named \"prefix\",\nlet's give the two prefixes verbose names so we don't\nconfuse them.\n\nSigned-off-by: Jeff King <peff@peff.net>\nAcked-by: Karthik Nayak <karthik.188@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/95c38fb0ed45d9eb529afeb704b840818ba3da4d"},{"sha":"18eb3a9ce7c544e74d424b942c5a5c9720c20112","author":{"email":"13fbd79c3d390e5d6585a21e11ff5ec1970cff0c@rhe.jp","name":"Kazuki Yamaguchi"},"message":"set_worktree_head_symref(): fix error message\n\nEmit an informative error when failed to hold lock of HEAD.\n\n2233066e (refs: add a new function set_worktree_head_symref,\n2016-03-27) added set_worktree_head_symref(), but this is missing a\ncall to unable_to_lock_message() after hold_lock_file_for_update()\nfails, so it emits an empty error message:\n\n  % git branch -m oldname newname\n  error:\n  error: HEAD of working tree /path/to/wt is not updated\n  fatal: Branch renamed to newname, but HEAD is not updated!\n\nThanks to Eric Sunshine for pointing this out.\n\nSigned-off-by: Kazuki Yamaguchi <k@rhe.jp>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/18eb3a9ce7c544e74d424b942c5a5c9720c20112"},{"sha":"741a6942eb241dfc1317b7692381fc41dbb92501","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'ky/branch-m-worktree'\n\nWhen \"git worktree\" feature is in use, \"git branch -m\" renamed a\nbranch that is checked out in another worktree without adjusting\nthe HEAD symbolic ref for the worktree.\n\n* ky/branch-m-worktree:\n  set_worktree_head_symref(): fix error message\n  branch -m: update all per-worktree HEADs\n  refs: add a new function set_worktree_head_symref","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/741a6942eb241dfc1317b7692381fc41dbb92501"},{"sha":"f5cc6129166e8f419cc9ad83136c30a983a94c15","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/branch-shortening-funny-symrefs'\n\nA change back in version 2.7 to \"git branch\" broke display of a\nsymbolic ref in a non-standard place in the refs/ hierarchy (we\nexpect symbolic refs to appear in refs/remotes/*/HEAD to point at\nthe primary branch the remote has, and as .git/HEAD to point at the\nbranch we locally checked out).\n\n* jk/branch-shortening-funny-symrefs:\n  branch: fix shortening of non-remote symrefs","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/f5cc6129166e8f419cc9ad83136c30a983a94c15"},{"sha":"e6ac6e1f7d54584c2b03f073b5f329a37f4a9561","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Fifth batch for post 2.8 cycle\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/e6ac6e1f7d54584c2b03f073b5f329a37f4a9561"},{"sha":"b50be5c444d21fcabd5f704daa0f568070e10120","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"extremely rough work-in-progress for curl auth callbacks\n\nThis adapts git to use curl's new auth callbacks for\nmanaging credentials. This is just enough to get it working\nexperimentally for me.","distinct":true,"url":"https://api.github.com/repos/peff/git/commits/b50be5c444d21fcabd5f704daa0f568070e10120"}]}