{"push_id":1127203000,"size":64,"distinct_size":1,"ref":"refs/heads/jk/commits-notes-wip","head":"ab07595e6ec5610c527ac07345ab6b4dd1bb40d8","before":"cfb5690574409abe163b3104219454355f9258ae","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":false,"url":"https://api.github.com/repos/peff/git/commits/8dc874b2ee61f0c457c4482ed2f202cac55b52ad"},{"sha":"8425b7ea6a00c443ca3649545ac6e9ddfa196ef6","author":{"email":"46568ccbbb14bc5b3fe132d5698eb4921f860650@gmail.com","name":"Pranit Bauva"},"message":"t0040-test-parse-options.sh: fix style issues\n\nSigned-off-by: Pranit Bauva <pranit.bauva@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/8425b7ea6a00c443ca3649545ac6e9ddfa196ef6"},{"sha":"36e6a5baf1d45e125fcdb99781a0c6448109b44d","author":{"email":"46568ccbbb14bc5b3fe132d5698eb4921f860650@gmail.com","name":"Pranit Bauva"},"message":"test-parse-options: print quiet as integer\n\nWe would want to see how multiple --quiet options affect the value of\nthe underlying variable (we may want \"--quiet --quiet\" to still be 1, or\nwe may want to see the value incremented to 2). Show the value as\ninteger to allow us to inspect it.\n\nSigned-off-by: Pranit Bauva <pranit.bauva@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/36e6a5baf1d45e125fcdb99781a0c6448109b44d"},{"sha":"ba0897e6ae6b0b3f259efb31be0f1ab3d820aacf","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"dir.c: rename str(n)cmp_icase to fspath(n)cmp\n\nThese functions compare two paths that are taken from file system.\nDepending on the running file system, paths may need to be compared\ncase-sensitively or not, and maybe even something else in future. The\ncurrent names do not convey that well.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/ba0897e6ae6b0b3f259efb31be0f1ab3d820aacf"},{"sha":"15cdfea734ffce99d930e8e8016787b57ac47386","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"path.c: add git_common_path() and strbuf_git_common_path()\n\nThese are mostly convenient functions to reduce code duplication. Most\nof the time, we should be able to get by with git_path() which handles\n$GIT_COMMON_DIR internally. However there are a few cases where we need\nto construct paths manually, for example some paths from a specific\nworktree. These functions will enable that.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/15cdfea734ffce99d930e8e8016787b57ac47386"},{"sha":"69dfe3b9420eb2a7f479a0a4cad663111af2b1f9","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"worktree.c: store \"id\" instead of \"git_dir\"\n\nWe can reconstruct git_dir from id quite easily. It's a bit hackier to\ndo the reverse.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/69dfe3b9420eb2a7f479a0a4cad663111af2b1f9"},{"sha":"d3b9ac07eb44974bb619d71fc6c81c9f2036b96c","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"worktree.c: make find_shared_symref() return struct worktree *\n\nThis gives the caller more information and they can answer things like,\n\"is it the main worktree\" or \"is it the current worktree\". The latter\nquestion is needed for the \"checkout a rebase branch\" case later.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/d3b9ac07eb44974bb619d71fc6c81c9f2036b96c"},{"sha":"750e8a60d69274acd820f812704c75927d82728e","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"worktree.c: mark current worktree\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/750e8a60d69274acd820f812704c75927d82728e"},{"sha":"2e641d5825673c7dca384bc12fcaf1681d731bb6","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"path.c: refactor and add worktree_git_path()\n\ndo_git_path(), which is the common code for all git_path* functions, is\nmodified to take a worktree struct and can produce paths for any\nworktree.\n\nworktree_git_path() is the first function that makes use of this. It can\nbe used to write code that can examine any worktree. For example,\nwt_status_get_state() will be converted using this to take\nam/rebase/... state of any worktree.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/2e641d5825673c7dca384bc12fcaf1681d731bb6"},{"sha":"bcd522a1495146113f8e08e84a6717c04508e197","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"wt-status.c: split rebase detection out of wt_status_get_state()\n\nworktree.c:find_shared_symref() later needs to know if a branch is being\nrebased, and only rebase, no cherry-pick, do detached branch... Split\nthis code so it can be used independently from other in-progress tests.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/bcd522a1495146113f8e08e84a6717c04508e197"},{"sha":"81eff27b0fb652f80a43bdf18c18cd9bc25840df","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"wt-status.c: make wt_status_check_rebase() work on any worktree\n\nThis is a preparation step for find_shared_symref() to detect if any\nworktree is being rebased.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/81eff27b0fb652f80a43bdf18c18cd9bc25840df"},{"sha":"c8717148d02c48340ffd6a01ca52c31fa374bf3c","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"worktree.c: avoid referencing to worktrees[i] multiple times\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/c8717148d02c48340ffd6a01ca52c31fa374bf3c"},{"sha":"8d9fdd7087d0c2700a56e20043d5d79c9951f64f","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"worktree.c: check whether branch is rebased in another worktree\n\nThis function find_shared_symref() is used in a couple places:\n\n1) in builtin/branch.c: it's used to detect if a branch is checked out\n   elsewhere and refuse to delete the branch.\n\n2) in builtin/notes.c: it's used to detect if a note is being merged in\n   another worktree\n\n3) in branch.c, the function die_if_checked_out() is actually used by\n   \"git checkout\" and \"git worktree add\" to see if a branch is already\n   checked out elsewhere and refuse the operation.\n\nIn cases 1 and 3, if a rebase is ongoing, \"HEAD\" will be in detached\nmode, find_shared_symref() fails to detect it and declares \"no branch is\nchecked out here\", which is not really what we want.\n\nThis patch tightens the test. If the given symref is \"HEAD\", we try to\ndetect if rebase is ongoing. If so return the branch being rebased. This\nmakes checkout and branch delete operations safer because you can't\ncheckout a branch being rebased in another place, or delete it.\n\nSpecial case for checkout. If the current branch is being rebased,\ngit-rebase.sh may use \"git checkout\" to abort and return back to the\noriginal branch. The updated test in find_shared_symref() will prevent\nthat and \"git rebase --abort\" will fail as a result.\nfind_shared_symref() and die_if_checked_out() have to learn a new\noption ignore_current_worktree to loosen the test a bit.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/8d9fdd7087d0c2700a56e20043d5d79c9951f64f"},{"sha":"f5d067a2b28143dca237712e5dae7738d563f85c","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"wt-status.c: split bisect detection out of wt_status_get_state()\n\nAnd make it work with any given worktree, in preparation for (again)\nfind_shared_symref(). read_and_strip_branch() is deleted because it's\nno longer used.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/f5d067a2b28143dca237712e5dae7738d563f85c"},{"sha":"04a3dfb8b5993fcb807fcbca8ed7ea608d30a204","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"worktree.c: check whether branch is bisected in another worktree\n\nSimilar to the rebase case, we want to detect if \"HEAD\" in some worktree\nis being bisected because\n\n1) we do not want to checkout this branch in another worktree, after\n   bisect is done it will want to go back to this branch\n\n2) we do not want to delete the branch is either or git bisect will\n   fail to return to the (long gone) branch\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/04a3dfb8b5993fcb807fcbca8ed7ea608d30a204"},{"sha":"14ace5b77b493506a1f8ffde96a2f49cc7bc4db0","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"branch: do not rename a branch under bisect or rebase\n\nThe branch name in that case could be saved in rebase's head_name or\nbisect's BISECT_START files. Ideally we should try to update them as\nwell. But it's trickier (*). Let's play safe and see if the user\ncomplains about inconveniences before doing that.\n\n(*) If we do it, bisect and rebase need to provide an API to rename\nbranches. We can't do it in worktree.c or builtin/branch.c because\nwhen other people change rebase/bisect code, they may not be aware of\nthis code and accidentally break it (e.g. rename the branch file, or\nrefer to the branch in new files). It's a lot more work.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/14ace5b77b493506a1f8ffde96a2f49cc7bc4db0"},{"sha":"ded2444ad8ab8128cae2b91b8efa57ea2dd8c7a5","author":{"email":"955341c97b9d93a23c19524fc0105a6405902afe@web.de","name":"Torsten Bögershausen"},"message":"t0027: make commit_chk_wrnNNO() reliable\n\nWhen the content of a commited file is unchanged and the attributes\nare changed, Git may not detect that the next commit must treat the\nfile as changed.  This happens when lstat() doesn't detect a change,\nsince neither inode, mtime nor size are changed.\n\nAdd a single \"Z\" character to change the file size and content.\nWhen the files are compared later in checkout_files(), the \"Z\" is\nremoved before the comparison.\n\nSigned-off-by: Torsten Bögershausen <tboegi@web.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/ded2444ad8ab8128cae2b91b8efa57ea2dd8c7a5"},{"sha":"70ad8c8d8c0840fb89492063274132d28bdfbe3b","author":{"email":"955341c97b9d93a23c19524fc0105a6405902afe@web.de","name":"Torsten Bögershausen"},"message":"convert: allow core.autocrlf=input and core.eol=crlf\n\nEven though the configuration parser errors out when core.autocrlf\nis set to 'input' when core.eol is set to 'crlf', there is no need\nto do so, because the core.autocrlf setting trumps core.eol.\n\nAllow all combinations of core.crlf and core.eol and document\nthat core.autocrlf overrides core.eol.\n\nSigned-off-by: Torsten Bögershausen <tboegi@web.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/70ad8c8d8c0840fb89492063274132d28bdfbe3b"},{"sha":"67e9bff06a82fd4c3f0caa577c1c8a3a0fc975ac","author":{"email":"955341c97b9d93a23c19524fc0105a6405902afe@web.de","name":"Torsten Bögershausen"},"message":"t0027: test cases for combined attributes\n\nAdd more test cases for the not normalized files (\"NNO\"). The\n\"text\" attribute is most important, use it as the first parameter.\n\"ident\", if set, is the second paramater followed by the eol\nattribute.  The eol attribute overrides core.autocrlf, which\noverrides core.eol.\nindent is not yet used, this will be done in the next commit.\n\nUse loops to test more combinations of attributes, like\n\"* text eol=crlf\" or especially \"*text=auto eol=crlf\".\n\nSigned-off-by: Torsten Bögershausen <tboegi@web.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/67e9bff06a82fd4c3f0caa577c1c8a3a0fc975ac"},{"sha":"caa47adc5a68045bfb9e88fcfee0e50589d129df","author":{"email":"955341c97b9d93a23c19524fc0105a6405902afe@web.de","name":"Torsten Bögershausen"},"message":"convert.c: ident + core.autocrlf didn't work\n\nWhen the ident attributes is set, get_stream_filter() did not obey\ncore.autocrlf=true, and the file was checked out with LF.\n\nChange the rule when a streaming filter can be used:\n- if an external filter is specified, don't use a stream filter.\n- if the worktree eol is CRLF and \"auto\" is active, don't use a stream filter.\n- Otherwise the stream filter can be used.\n\nAdd test cases in t0027.\n\nSigned-off-by: Torsten Bögershausen <tboegi@web.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/caa47adc5a68045bfb9e88fcfee0e50589d129df"}]}
{"actor":{"display_login":"peff"}}