Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.6.3 2015-11-05T20:18:15Z 2015-11-05T20:18:15Z Junio C Hamano gitster@pobox.com 2015-11-05T20:18:15Z urn:sha1:db43891ce60d0f713a41cfc46097262c73aa99d7 "git status --branch --short" accessed beyond the constant string "HEAD", which has been corrected. * rs/wt-status-detached-branch-fix: wt-status: use skip_prefix() to get rid of magic string length constants wt-status: don't skip a magical number of characters blindly wt-status: avoid building bogus branch name with detached HEAD wt-status: exit early using goto in wt_shortstatus_print_tracking() t7060: add test for status --branch on a detached HEAD 2015-11-05T20:18:12Z Junio C Hamano gitster@pobox.com 2015-11-05T20:18:12Z urn:sha1:a878e7e62b4826a95effa1420cff47807f9cb88b "git --literal-pathspecs add -u/-A" without any command line argument misbehaved ever since Git 2.0. * jc/add-u-A-default-to-top: add: simplify -u/-A without pathspec 2015-11-05T20:18:11Z Junio C Hamano gitster@pobox.com 2015-11-05T20:18:11Z urn:sha1:5e6154fb145d66af36e10ef4db7e1d1e9502c501 Merging a branch that removes a path and another that changes the mode bits on the same path should have conflicted at the path, but it didn't and silently favoured the removal. * jk/delete-modechange-conflict: merge: detect delete/modechange conflict t6031: generalize for recursive and resolve strategies t6031: move triple-rename test to t3030 2015-11-05T20:18:08Z Junio C Hamano gitster@pobox.com 2015-11-05T20:18:07Z urn:sha1:4349f597f08b6dc50fc6198b8e1b96e19df37c65 It was not possible to use a repository-lookalike created by "git worktree add" as a local source of "git clone". * nd/clone-linked-checkout: clone: better error when --reference is a linked checkout clone: allow --local from a linked checkout enter_repo: allow .git files in strict mode enter_repo: avoid duplicating logic, use is_git_directory() instead t0002: add test for enter_repo(), non-strict mode path.c: delete an extra space 2015-11-03T23:32:41Z Junio C Hamano gitster@pobox.com 2015-11-03T23:32:41Z urn:sha1:5c15ca0b3c866398f22cbab974d0a1964ef105ca "git merge-file" tried to signal how many conflicts it found, which obviously would not work well when there are too many of them. * jk/merge-file-exit-code: merge-file: clamp exit code to maximum 127 2015-11-03T23:32:36Z Junio C Hamano gitster@pobox.com 2015-11-03T23:32:36Z urn:sha1:ccb47391c1e35c5475529cb8f3bd66028df5a943 * dt/t7063-fix-flaky-test: t7063: fix flaky untracked-cache test 2015-11-03T23:32:35Z Junio C Hamano gitster@pobox.com 2015-11-03T23:32:34Z urn:sha1:1bf986bc9c1e823da27465bfd9faf2b725bbcc09 The submodule code has been taught to work better with separate work trees created via "git worktree add". * mk/submodule-gitdir-path: path: implement common_dir handling in git_pathdup_submodule() submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb() 2015-11-03T23:32:32Z Junio C Hamano gitster@pobox.com 2015-11-03T23:32:31Z urn:sha1:c7bdbd6f92bbab2a030ee8bf7957af25327545e5 Work around "git p4" failing when the P4 depot records the contents in UTF-16 without UTF-16 BOM. * ls/p4-translation-failure: git-p4: handle "Translation of file content failed" git-p4: add test case for "Translation of file content failed" error 2015-11-03T23:32:30Z Junio C Hamano gitster@pobox.com 2015-11-03T23:32:30Z urn:sha1:c04b3a2dbff67605078139f97d4546716e4a1f40 Recent update to "rebase -i" that tries to sanity check the edited insn sheet before it uses it has become too picky on Windows where CRLF left by the editor is turned into a trailing CR on the line read via the "read" built-in command. * gr/rebase-i-drop-warn: rebase-i: work around Windows CRLF line endings t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings 2015-11-03T23:32:29Z Junio C Hamano gitster@pobox.com 2015-11-03T23:32:28Z urn:sha1:f836a32ba75beded3bca960f2918e08309642c62 "git clone --dissociate" runs a big "git repack" process at the end, and it helps to close file descriptors that are open on the packs and their idx files before doing so on filesystems that cannot remove a file that is still open. * js/clone-dissociate: clone --dissociate: avoid locking pack files sha1_file.c: add a function to release all packs sha1_file: consolidate code to close a pack's file descriptor t5700: demonstrate a Windows file locking issue with `git clone --dissociate`