Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.13.2 2017-06-24T22:29:31Z 2017-06-24T22:29:31Z Junio C Hamano gitster@pobox.com 2017-06-24T22:29:31Z urn:sha1:b960cd37c6ec11b35802216c38c9d02886f4fce8 Comment fix. * jc/diff-tree-stale-comment: diff-tree: update stale in-code comments 2017-06-24T22:29:28Z Junio C Hamano gitster@pobox.com 2017-06-24T22:29:28Z urn:sha1:7809876866a0a19bb9796f91df6e612b507b7af8 The result from "git diff" that compares two blobs, e.g. "git diff $commit1:$path $commit2:$path", used to be shown with the full object name as given on the command line, but it is more natural to use the $path in the output and use it to look up .gitattributes. * jk/diff-blob: diff: use blob path for blob/file diffs diff: use pending "path" if it is available diff: use the word "path" instead of "name" for blobs diff: pass whole pending entry in blobinfo handle_revision_arg: record paths for pending objects handle_revision_arg: record modes for "a..b" endpoints t4063: add tests of direct blob diffs get_sha1_with_context: dynamically allocate oc->path get_sha1_with_context: always initialize oc->symlink_path sha1_name: consistently refer to object_context as "oc" handle_revision_arg: add handle_dotdot() helper handle_revision_arg: hoist ".." check out of range parsing handle_revision_arg: stop using "dotdot" as a generic pointer handle_revision_arg: simplify commit reference lookups handle_revision_arg: reset "dotdot" consistently 2017-06-24T22:29:28Z Junio C Hamano gitster@pobox.com 2017-06-24T22:29:27Z urn:sha1:e8d9d8b0bdb8c43c8c5e23c3a2fe99a1dcbe8015 "git describe --contains" penalized light-weight tags so much that they were almost never considered. Instead, give them about the same chance to be considered as an annotated tag that is the same age as the underlying commit would. * jc/name-rev-lw-tag: name-rev: favor describing with tags and use committer date to tiebreak name-rev: refactor logic to see if a new candidate is a better name 2017-06-13T20:27:03Z Junio C Hamano gitster@pobox.com 2017-06-13T20:27:03Z urn:sha1:9e60e21e53a6a8be899f9834955017e0ff6e6906 "git pull --rebase --autostash" didn't auto-stash when the local history fast-forwards to the upstream. * tb/pull-ff-rebase-autostash: pull: ff --rebase --autostash works in dirty repo 2017-06-13T20:27:02Z Junio C Hamano gitster@pobox.com 2017-06-13T20:27:01Z urn:sha1:f4683b4e9cad5e0077fe0a067b15f69c828581bb "git clean -d" used to clean directories that has ignored files, even though the command should not lose ignored ones without "-x". "git status --ignored" did not list ignored and untracked files without "-uall". These have been corrected. * sl/clean-d-ignored-fix: clean: teach clean -d to preserve ignored paths dir: expose cmp_name() and check_contains() dir: hide untracked contents of untracked dirs dir: recurse into untracked dirs for ignored files t7061: status --ignored should search untracked dirs t7300: clean -d should skip dirs with ignored files 2017-06-13T20:26:59Z Junio C Hamano gitster@pobox.com 2017-06-13T20:26:59Z urn:sha1:7a190a215dbcf782c33ed531104389de8504e29d Introduce the BUG() macro to improve die("BUG: ..."). * jk/bug-to-abort: usage: add NORETURN to BUG() function definitions config: complain about --local outside of a git repo setup_git_env: convert die("BUG") to BUG() usage.c: add BUG() function 2017-06-05T00:03:15Z Junio C Hamano gitster@pobox.com 2017-06-05T00:03:15Z urn:sha1:f72e075e300cd4fb74adf61d574fd2125c37e2eb "git am -h" triggered a BUG(). * jk/unbreak-am-h: am: handle "-h" argument earlier 2017-06-05T00:03:13Z Junio C Hamano gitster@pobox.com 2017-06-05T00:03:13Z urn:sha1:00c0e40f020581ff010a3efd96243bf0ae726fb0 "git interpret-trailers", when used as GIT_EDITOR for "git commit -v", looked for and appended to a trailer block at the very end, i.e. at the end of the "diff" output. The command has been corrected to pay attention to the cut-mark line "commit -v" adds to the buffer---the real trailer block should appear just before it. * bm/interpret-trailers-cut-line-is-eom: interpret-trailers: honor the cut line 2017-06-05T00:03:12Z Junio C Hamano gitster@pobox.com 2017-06-05T00:03:12Z urn:sha1:a207ad7081e42a64f826bd4d5193cecb67c84024 A few codepaths in "checkout" and "am" working on an unborn branch tried to access an uninitialized piece of memory. * rs/checkout-am-fix-unborn: am: check return value of resolve_refdup before using hash checkout: check return value of resolve_refdup before using hash 2017-06-05T00:03:11Z Junio C Hamano gitster@pobox.com 2017-06-05T00:03:11Z urn:sha1:c8c33216333c4b2ba86f51d9fa77f7c4daba8d30 "git clone --config var=val" is a way to populate the per-repository configuration file of the new repository, but it did not work well when val is an empty string. This has been fixed. * jn/clone-add-empty-config-from-command-line: clone: handle empty config values in -c