Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
sort by:
Revision Author Date Message Commit Date
8c8e978 Junio C Hamano 24 June 2017, 22:31:36 UTC Git 2.13.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 June 2017, 22:31:36 UTC
8992def Junio C Hamano 24 June 2017, 22:29:35 UTC Merge branch 'sn/reset-doc-typofix' into maint Doc update. * sn/reset-doc-typofix: doc: git-reset: fix a trivial typo 24 June 2017, 22:29:35 UTC
74567ac Junio C Hamano 24 June 2017, 22:29:35 UTC Merge branch 'sg/doc-pretty-formats' into maint Doc update. * sg/doc-pretty-formats: docs/pretty-formats: stress that %- removes all preceding line-feeds 24 June 2017, 22:29:35 UTC
77bcac3 Junio C Hamano 24 June 2017, 22:29:34 UTC Merge branch 'sd/t3200-branch-m-test' into maint New test. * sd/t3200-branch-m-test: t3200: add test for single parameter passed to -m option 24 June 2017, 22:29:34 UTC
8d7a6b6 Junio C Hamano 24 June 2017, 22:29:34 UTC Merge branch 'sg/revision-parser-skip-prefix' into maint Code clean-up. * sg/revision-parser-skip-prefix: revision.c: use skip_prefix() in handle_revision_pseudo_opt() revision.c: use skip_prefix() in handle_revision_opt() revision.c: stricter parsing of '--early-output' revision.c: stricter parsing of '--no-{min,max}-parents' revision.h: turn rev_info.early_output back into an unsigned int 24 June 2017, 22:29:34 UTC
6f0c89d Junio C Hamano 24 June 2017, 22:29:33 UTC Merge branch 'km/test-mailinfo-b-failure' into maint New tests. * km/test-mailinfo-b-failure: t5100: add some more mailinfo tests 24 June 2017, 22:29:33 UTC
4f7132a Junio C Hamano 24 June 2017, 22:29:32 UTC Merge branch 'sb/submodule-rm-absorb' into maint Doc update to a recently graduated topic. * sb/submodule-rm-absorb: Documentation/git-rm: correct submodule description 24 June 2017, 22:29:32 UTC
b960cd3 Junio C Hamano 24 June 2017, 22:29:31 UTC Merge branch 'jc/diff-tree-stale-comment' into maint Comment fix. * jc/diff-tree-stale-comment: diff-tree: update stale in-code comments 24 June 2017, 22:29:31 UTC
c4db75f Junio C Hamano 24 June 2017, 22:29:30 UTC Merge branch 'ps/stash-push-pathspec-fix' into maint "git stash push <pathspec>" did not work from a subdirectory at all. Bugfix for a topic in v2.13 * ps/stash-push-pathspec-fix: git-stash: fix pushing stash with pathspec from subdir 24 June 2017, 22:29:30 UTC
0378c85 Junio C Hamano 24 June 2017, 22:29:29 UTC Merge branch 'ls/github' into maint Help contributors that visit us at GitHub. * ls/github: Configure Git contribution guidelines for github.com 24 June 2017, 22:29:29 UTC
7deb48a Junio C Hamano 24 June 2017, 22:29:29 UTC Merge branch 'jk/pack-idx-corruption-safety' into maint A flaky test has been corrected. * jk/pack-idx-corruption-safety: t5313: make extended-table test more deterministic 24 June 2017, 22:29:29 UTC
7809876 Junio C Hamano 24 June 2017, 22:29:28 UTC Merge branch 'jk/diff-blob' into maint 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 24 June 2017, 22:29:28 UTC
e8d9d8b Junio C Hamano 24 June 2017, 22:29:27 UTC Merge branch 'jc/name-rev-lw-tag' into maint "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 24 June 2017, 22:29:28 UTC
8abc09c SZEDER Gábor 15 June 2017, 10:36:07 UTC docs/pretty-formats: stress that %- removes all preceding line-feeds Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 June 2017, 21:45:28 UTC
680b469 Štěpán Němec 14 June 2017, 09:36:58 UTC doc: git-reset: fix a trivial typo Signed-off-by: Štěpán Němec <stepnem@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 June 2017, 20:42:58 UTC
fd99e2b Junio C Hamano 13 June 2017, 20:30:16 UTC Prepare for 2.13.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 June 2017, 20:30:16 UTC
603d52d Junio C Hamano 13 June 2017, 20:27:06 UTC Merge branch 'ad/pull-remote-doc' into maint Docfix. * ad/pull-remote-doc: docs: fix formatting and grammar 13 June 2017, 20:27:06 UTC
9451a7b Junio C Hamano 13 June 2017, 20:27:06 UTC Merge branch 'jk/drop-free-refspecs' into maint Code clean-up. * jk/drop-free-refspecs: remote: drop free_refspecs() function 13 June 2017, 20:27:06 UTC
87d4fdd Junio C Hamano 13 June 2017, 20:27:05 UTC Merge branch 'jk/connect-symref-info-leak-fix' into maint Leakfix. * jk/connect-symref-info-leak-fix: connect.c: fix leak in parse_one_symref_info() 13 June 2017, 20:27:05 UTC
e0538ab Junio C Hamano 13 June 2017, 20:27:05 UTC Merge branch 'rf/completion-config-commit' into maint Completion update. * rf/completion-config-commit: completion: add completions for git config commit 13 June 2017, 20:27:05 UTC
cbbe1c8 Junio C Hamano 13 June 2017, 20:27:04 UTC Merge branch 'ab/t3070-test-dedup' into maint Test cleanup. * ab/t3070-test-dedup: wildmatch test: remove redundant duplicate test 13 June 2017, 20:27:04 UTC
a4478c9 Junio C Hamano 13 June 2017, 20:27:03 UTC Merge branch 'jh/memihash-opt' into maint perf-test update. * jh/memihash-opt: p0004: don't error out if test repo is too small p0004: don't abort if multi-threaded is too slow p0004: use test_perf p0004: avoid using pipes p0004: simplify calls of test-lazy-init-name-hash 13 June 2017, 20:27:04 UTC
9e60e21 Junio C Hamano 13 June 2017, 20:27:03 UTC Merge branch 'tb/pull-ff-rebase-autostash' into maint "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 13 June 2017, 20:27:03 UTC
f24e079 Junio C Hamano 13 June 2017, 20:27:02 UTC Merge branch 'jh/close-index-before-stat' into maint The timestamp of the index file is now taken after the file is closed, to help Windows, on which a stale timestamp is reported by fstat() on a file that is opened for writing and data was written but not yet closed. * jh/close-index-before-stat: read-cache: close index.lock in do_write_index 13 June 2017, 20:27:02 UTC
f4683b4 Junio C Hamano 13 June 2017, 20:27:01 UTC Merge branch 'sl/clean-d-ignored-fix' into maint "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 13 June 2017, 20:27:02 UTC
f381e42 Junio C Hamano 13 June 2017, 20:27:01 UTC Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able' into maint A hotfix to a topic in 'master'. * dk/send-email-avoid-net-smtp-ssl-when-able: send-email: Net::SMTP::starttls was introduced in v2.34 send-email: Net::SMTP::SSL is obsolete, use only when necessary 13 June 2017, 20:27:01 UTC
8a5732c Junio C Hamano 13 June 2017, 20:27:00 UTC Merge branch 'jc/skip-test-in-the-middle' into maint A recent update to t5545-push-options.sh started skipping all the tests in the script when a web server testing is disabled or unavailable, not just the ones that require a web server. Non HTTP tests have been salvaged to always run in this script. * jc/skip-test-in-the-middle: t5545: enhance test coverage when no http server is installed test: allow skipping the remainder 13 June 2017, 20:27:00 UTC
e350625 Junio C Hamano 13 June 2017, 20:26:59 UTC Merge branch 'bw/forking-and-threading' into maint The "run-command" API implementation has been made more robust against dead-locking in a threaded environment. * bw/forking-and-threading: usage.c: drop set_error_handle() run-command: restrict PATH search to executable files run-command: expose is_executable function run-command: block signals between fork and execve run-command: add note about forking and threading run-command: handle dup2 and close errors in child run-command: eliminate calls to error handling functions in child run-command: don't die in child when duping /dev/null run-command: prepare child environment before forking string-list: add string_list_remove function run-command: use the async-signal-safe execv instead of execvp run-command: prepare command before forking t0061: run_command executes scripts without a #! line t5550: use write_script to generate post-update hook 13 June 2017, 20:27:00 UTC
7a190a2 Junio C Hamano 13 June 2017, 20:26:59 UTC Merge branch 'jk/bug-to-abort' into maint 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 13 June 2017, 20:26:59 UTC
146b0ab Junio C Hamano 13 June 2017, 20:26:59 UTC Merge branch 'sb/checkout-recurse-submodules' into maint "git checkout --recurse-submodules" did not quite work with a submodule that itself has submodules. * sb/checkout-recurse-submodules: submodule: properly recurse for read-tree and checkout submodule: avoid auto-discovery in new working tree manipulator code submodule_move_head: reuse child_process structure for futher commands 13 June 2017, 20:26:59 UTC
0b1bb0c Lars Schneider 13 June 2017, 08:18:07 UTC Configure Git contribution guidelines for github.com Many open source projects use github.com for their contribution process. Although we mirror the Git core repository to github.com [1] we do not use any other github.com service. This is unknown/unexpected to a number of (potential) contributors and consequently they create Pull Requests against our mirror with their contributions. These Pull Requests become stale. This is frustrating to them as they think we ignore them and it is also unsatisfactory for us as we miss potential code improvements and/or new contributors. GitHub contribution guidelines and a GitHub Pull Request template that is visible to every Pull Request creator can be configured with special files in a Git repository [2]. Let's make use of this! [1] https://github.com/git/git [2] https://help.github.com/articles/creating-a-pull-request-template-for-your-repository/ Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 June 2017, 15:41:47 UTC
22fc703 Patrick Steinhardt 13 June 2017, 11:38:34 UTC git-stash: fix pushing stash with pathspec from subdir The `git stash push` command recently gained the ability to get a pathspec as its argument to only stash matching files. Calling this command from a subdirectory does not work, though, as one of the first things we do is changing to the top level directory without keeping track of the prefix from which the command is being run. Fix the shortcoming by storing the prefix previous to the call to `cd_to_toplevel` and then subsequently using `git rev-parse --prefix` to correctly resolve the pathspec. Add a test to catch future breakage of this usecase. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 June 2017, 15:27:13 UTC
bb8efa1 Sahil Dua 13 June 2017, 10:47:22 UTC t3200: add test for single parameter passed to -m option Add a test for the case when only one parameter is passed to '-m' (move/rename) option. For example - if 'git branch -m bbb' is run while checked out on aaa branch, it should rename the currently checked out branch to bbb. There was no test for this particular case with only one parameter for -m option. However, there's one similar test case for -M option. Add test for making sure HEAD points to the bbb (new branch name). Also add a test for making sure the reflog that is moved to 'bbb' retains entries created for the currently checked out branch. Note that since the topmost entry on reflog for bbb will be about branch creation, we compare bbb@{1} (instead of bbb@{0}) with aaa@{0} to make sure the reflog for bbb retains entries from aaa. Signed-off-by: Sahil Dua <sahildua2305@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 June 2017, 15:04:16 UTC
8b1d913 SZEDER Gábor 09 June 2017, 18:17:33 UTC revision.c: use skip_prefix() in handle_revision_pseudo_opt() Instead of starts_with() and a bunch of magic numbers. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2017, 20:39:52 UTC
479b3d9 SZEDER Gábor 09 June 2017, 18:17:32 UTC revision.c: use skip_prefix() in handle_revision_opt() Instead of starts_with() and a bunch of magic numbers. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2017, 20:39:49 UTC
dffc651 SZEDER Gábor 09 June 2017, 18:17:31 UTC revision.c: stricter parsing of '--early-output' The parsing of '--early-output' with or without its optional integer argument allowed bogus options like '--early-output-foobarbaz' to slip through and be ignored. Fix it by parsing '--early-output' in the same way as other options with an optional argument are parsed. Furthermore, use strtoul_ui() to parse the optional integer argument and to refuse negative numbers. While at it, use skip_prefix() instead of starts_with() and magic numbers. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2017, 20:39:46 UTC
9ada7ae SZEDER Gábor 09 June 2017, 18:17:30 UTC revision.c: stricter parsing of '--no-{min,max}-parents' These two options are parsed using starts_with(), allowing things like 'git log --no-min-parents-foobarbaz' to succeed. Use strcmp() instead. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2017, 20:39:43 UTC
e35b6ac SZEDER Gábor 10 June 2017, 11:41:01 UTC revision.h: turn rev_info.early_output back into an unsigned int rev_info.early_output started out as an unsigned int in cdcefbc97 (Add "--early-output" log flag for interactive GUI use, 2007-11-03), but later it was turned into a single bit in a bit field in cc243c3ce (show: --ignore-missing, 2011-05-18) without explanation, though the code using it still expects it to be a regular integer type and uses it as a counter. Consequently, any even number given via '--early-output=<N>', or indeed a plain '--early-output' defaulting to 100 effectively disabled the feature. Turn rev_info.early_output back into its origin unsigned int data type, making '--early-output' work again. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2017, 20:39:32 UTC
ae52d57 Kyle J. McKay 31 May 2017, 10:26:10 UTC t5100: add some more mailinfo tests Add some more simple mailinfo tests including a few that produce: fatal: `pos + len' is too far after the end of the buffer Mark those as 'test_expect_failure'. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2017, 16:37:08 UTC
7633952 Junio C Hamano 07 June 2017, 00:31:53 UTC Merge branch 'ab/sha1dc-maint' into maint * ab/sha1dc-maint: sha1dc: update from upstream sha1dc: ignore indent-with-non-tab whitespace violations 07 June 2017, 00:31:53 UTC
6b851e5 Ævar Arnfjörð Bjarmason 06 June 2017, 15:12:29 UTC sha1dc: update from upstream Update sha1dc from the latest version by the upstream maintainer[1]. See commit a0103914c2 ("sha1dc: update from upstream", 2017-05-20) for the latest update. That update was done sans some whitespace changes by upstream, which is why the diff here isn't the same as the upstream cc46554..e139984. It also brings in a change[2] upstream made which should hopefully address the breakage in 2.13.1 on Cygwin, see [3]. Cygwin defines both _BIG_ENDIAN and _LITTLE_ENDIAN. Adam Dinwoodie reports on the mailing list that that upstream commit fixes the issue on Cygwin[4]. 1. https://github.com/cr-marcstevens/sha1collisiondetection/commit/e1399840b501a68ac6c8d7ed9a5cb1455480200e 2. https://github.com/cr-marcstevens/sha1collisiondetection/commit/a24eef58c0684078405f8c7a89f9b78271432005 3. <20170606100355.GC25777@dinwoodie.org> (https://public-inbox.org/git/20170606100355.GC25777@dinwoodie.org/) 4. <20170606124323.GD25777@dinwoodie.org> (https://public-inbox.org/git/20170606124323.GD25777@dinwoodie.org/) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 June 2017, 00:25:20 UTC
5d184f4 Jeff King 06 June 2017, 19:01:11 UTC sha1dc: ignore indent-with-non-tab whitespace violations The upstream sha1dc code indents some lines with spaces. While this doesn't match Git's coding guidelines, it's better to leave this imported code untouched than to try to make it match our style. However, we can use .gitattributes to tell "diff --check" and "git am" not to bother us about it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 June 2017, 00:25:07 UTC
7c2115a Jeff King 05 June 2017, 19:15:25 UTC t5313: make extended-table test more deterministic Commit a1283866b (t5313: test bounds-checks of corrupted/malicious pack/idx files, 2016-02-25) added a test that requires our corrupted pack index to have two objects. The entry for the first one remains untouched, but we corrupt the entry for second one. Since the index stores the entries in sha1-sorted order, this means that the test must make sure that the sha1 of the object we expect to be corrupted ("$object") sorts after the other placeholder object. That commit used the HEAD commit as the placeholder, but the script never calls test_tick. That means that the commit object (and thus its sha1) depends on the timestamp when the test script is run. This usually works in practice, because the sha1 of $object starts with "fff". The commit object will sort after that only 1 in 4096 times, but when it does the test will fail. One obvious solution is to add the test_tick call to get a deterministic commit sha1. But since we're relying on the sort order for the test to function, let's make that very explicit by just generating a second blob with a known sha1. Reported-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 June 2017, 22:45:59 UTC
2c04f63 Junio C Hamano 05 June 2017, 00:05:38 UTC Git 2.13.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 June 2017, 00:05:38 UTC
478d3c3 Junio C Hamano 05 June 2017, 00:03:23 UTC Merge branch 'ah/doc-rev-parse-short-default' into maint Doc update. * ah/doc-rev-parse-short-default: doc: rewrite description for rev-parse --short 05 June 2017, 00:03:23 UTC
f166aab Junio C Hamano 05 June 2017, 00:03:22 UTC Merge branch 'ah/doc-filter-branch-export-env' into maint Docfix. * ah/doc-filter-branch-export-env: doc: filter-branch does not require re-export of vars 05 June 2017, 00:03:22 UTC
e06b421 Junio C Hamano 05 June 2017, 00:03:22 UTC Merge branch 'sd/t3200-typofix' into maint Test fix. * sd/t3200-typofix: branch test: fix invalid config key access 05 June 2017, 00:03:22 UTC
2ed824b Junio C Hamano 05 June 2017, 00:03:21 UTC Merge branch 'sb/t5531-update-desc' into maint The description strings for a few tests have been updated. * sb/t5531-update-desc: t5531: fix test description 05 June 2017, 00:03:21 UTC
bba1c2b Junio C Hamano 05 June 2017, 00:03:20 UTC Merge branch 'ah/doc-pretty-format-fix' into maint Documentation fix. * ah/doc-pretty-format-fix: Documentation: fix formatting typo in pretty-formats.txt 05 June 2017, 00:03:20 UTC
04dad24 Junio C Hamano 05 June 2017, 00:03:19 UTC Merge branch 'ah/doc-interpret-trailers-ifexists' into maint Documentation fix. * ah/doc-interpret-trailers-ifexists: Documentation: fix reference to ifExists for interpret-trailers 05 June 2017, 00:03:19 UTC
0d86bbd Junio C Hamano 05 June 2017, 00:03:18 UTC Merge branch 'ab/ref-filter-no-contains' into maint Doc update to a recent topic. * ab/ref-filter-no-contains: tag: duplicate mention of --contains should mention --no-contains 05 June 2017, 00:03:18 UTC
b8a4652 Junio C Hamano 05 June 2017, 00:03:17 UTC Merge branch 'sg/core-filemode-doc-typofix' into maint * sg/core-filemode-doc-typofix: docs/config.txt: fix indefinite article in core.fileMode description 05 June 2017, 00:03:17 UTC
86799c1 Junio C Hamano 05 June 2017, 00:03:16 UTC Merge branch 'tb/dedup-crlf-tests' into maint * tb/dedup-crlf-tests: t0027: tests are not expensive; remove t0025 05 June 2017, 00:03:16 UTC
9a73c95 Junio C Hamano 05 June 2017, 00:03:16 UTC Merge branch 'jn/credential-doc-on-clear' into maint Doc update. * jn/credential-doc-on-clear: credential doc: make multiple-helper behavior more prominent 05 June 2017, 00:03:16 UTC
7dab7c5 Junio C Hamano 05 June 2017, 00:03:15 UTC Merge branch 'jk/url-insteadof-config' into maint The interaction of "url.*.insteadOf" and custom URL scheme's whitelisting is now documented better. * jk/url-insteadof-config: docs/config: mention protocol implications of url.insteadOf 05 June 2017, 00:03:15 UTC
f72e075 Junio C Hamano 05 June 2017, 00:03:15 UTC Merge branch 'jk/unbreak-am-h' into maint "git am -h" triggered a BUG(). * jk/unbreak-am-h: am: handle "-h" argument earlier 05 June 2017, 00:03:15 UTC
d0506fc Junio C Hamano 05 June 2017, 00:03:15 UTC Merge branch 'ab/sha1dc-maint' into maint The "collision detecting" SHA-1 implementation shipped with 2.13 was quite broken on some big-endian platforms and/or platforms that do not like unaligned fetches. Update to the upstream code which has already fixed these issues. * ab/sha1dc-maint: sha1dc: update from upstream 05 June 2017, 00:03:15 UTC
e6f80ae Junio C Hamano 05 June 2017, 00:03:15 UTC Merge branch 'js/bs-is-a-dir-sep-on-windows' into maint "foo\bar\baz" in "git fetch foo\bar\baz", even though there is no slashes in it, cannot be a nickname for a remote on Windows, as that is likely to be a pathname on a local filesystem. * js/bs-is-a-dir-sep-on-windows: Windows: do not treat a path with backslashes as a remote's nick name mingw.h: permit arguments with side effects for is_dir_sep 05 June 2017, 00:03:15 UTC
a07148d Junio C Hamano 05 June 2017, 00:03:14 UTC Merge branch 'jk/alternate-ref-optim' into maint A test allowed both "git push" and "git receive-pack" on the other end write their traces into the same file. This is OK on platforms that allows atomically appending to a file opened with O_APPEND, but on other platforms led to a mangled output, causing intermittent test failures. This has been fixed by disabling traces from "receive-pack" in the test. * jk/alternate-ref-optim: t5400: avoid concurrent writes into a trace file 05 June 2017, 00:03:14 UTC
00c0e40 Junio C Hamano 05 June 2017, 00:03:13 UTC Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maint "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 05 June 2017, 00:03:13 UTC
fd8567c Junio C Hamano 05 June 2017, 00:03:13 UTC Merge branch 'kn/ref-filter-branch-list' into maint "git for-each-ref --format=..." with %(HEAD) in the format used to resolve the HEAD symref as many times as it had processed refs, which was wasteful, and "git branch" shared the same problem. * kn/ref-filter-branch-list: ref-filter: resolve HEAD when parsing %(HEAD) atom 05 June 2017, 00:03:13 UTC
a207ad7 Junio C Hamano 05 June 2017, 00:03:12 UTC Merge branch 'rs/checkout-am-fix-unborn' into maint 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 05 June 2017, 00:03:12 UTC
c8c3321 Junio C Hamano 05 June 2017, 00:03:11 UTC Merge branch 'jn/clone-add-empty-config-from-command-line' into maint "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 05 June 2017, 00:03:11 UTC
b19174e Junio C Hamano 05 June 2017, 00:03:10 UTC Merge branch 'ab/c-translators-comment-style' into maint Update the C style recommendation for notes for translators, as recent versions of gettext tools can work with our style of multi-line comments. * ab/c-translators-comment-style: C style: use standard style for "TRANSLATORS" comments 05 June 2017, 00:03:10 UTC
916a338 Junio C Hamano 05 June 2017, 00:03:10 UTC Merge branch 'ls/travis-doc-asciidoctor' into maint Travis CI gained a task to format the documentation with both AsciiDoc and AsciiDoctor. * ls/travis-doc-asciidoctor: travis-ci: check AsciiDoc/AsciiDoctor stderr output travis-ci: unset compiler for jobs that do not need one travis-ci: parallelize documentation build travis-ci: build documentation with AsciiDoc and Asciidoctor 05 June 2017, 00:03:10 UTC
68602c0 Stefan Beller 02 June 2017, 19:28:10 UTC Documentation/git-rm: correct submodule description Since 3ccd681c2a (Merge branch 'sb/submodule-rm-absorb', 2017-01-18) git-rm tries to absorb any submodules git dir before deleting the submodule. Correct the documentation to say so. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 June 2017, 02:07:04 UTC
e215bd9 Junio C Hamano 04 June 2017, 01:25:42 UTC Prepare for 2.13.1; more topics to follow Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 June 2017, 01:29:06 UTC
5ecbaaf Junio C Hamano 04 June 2017, 01:21:07 UTC Merge branch 'tg/stash-push-fixup' into maint The shell completion script (in contrib/) learned "git stash" has a new "push" subcommand. * tg/stash-push-fixup: completion: add git stash push 04 June 2017, 01:21:08 UTC
b522c33 Junio C Hamano 04 June 2017, 01:21:07 UTC Merge branch 'km/log-showsignature-doc' into maint Doc update. * km/log-showsignature-doc: config.txt: add an entry for log.showSignature 04 June 2017, 01:21:07 UTC
e2ae5ec Junio C Hamano 04 June 2017, 01:21:06 UTC Merge branch 'jt/use-trailer-api-in-commands' into maint "git cherry-pick" and other uses of the sequencer machinery mishandled a trailer block whose last line is an incomplete line. This has been fixed so that an additional sign-off etc. are added after completing the existing incomplete line. * jt/use-trailer-api-in-commands: sequencer: add newline before adding footers 04 June 2017, 01:21:06 UTC
058d655 Junio C Hamano 04 June 2017, 01:21:05 UTC Merge branch 'jt/push-options-doc' into maint The receive-pack program now makes sure that the push certificate records the same set of push options used for pushing. * jt/push-options-doc: receive-pack: verify push options in cert docs: correct receive.advertisePushOptions default 04 June 2017, 01:21:05 UTC
34bbe2e Junio C Hamano 04 June 2017, 01:21:04 UTC Merge branch 'js/plug-leaks' into maint Fix memory leaks pointed out by Coverity (and people). * js/plug-leaks: (26 commits) checkout: fix memory leak submodule_uses_worktrees(): plug memory leak show_worktree(): plug memory leak name-rev: avoid leaking memory in the `deref` case remote: plug memory leak in match_explicit() add_reflog_for_walk: avoid memory leak shallow: avoid memory leak line-log: avoid memory leak receive-pack: plug memory leak in update() fast-export: avoid leaking memory in handle_tag() mktree: plug memory leaks reported by Coverity pack-redundant: plug memory leak setup_discovered_git_dir(): plug memory leak setup_bare_git_dir(): help static analysis split_commit_in_progress(): simplify & fix memory leak checkout: fix memory leak cat-file: fix memory leak mailinfo & mailsplit: check for EOF while parsing status: close file descriptor after reading git-rebase-todo difftool: address a couple of resource/memory leaks ... 04 June 2017, 01:21:04 UTC
7ba4fa5 Junio C Hamano 04 June 2017, 01:21:04 UTC Merge branch 'js/eol-on-ourselves' into maint Make sure our tests would pass when the sources are checked out with "platform native" line ending convention by default on Windows. Some "text" files out tests use and the test scripts themselves that are meant to be run with /bin/sh, ought to be checked out with eol=LF even on Windows. * js/eol-on-ourselves: t4051: mark supporting files as requiring LF-only line endings Fix the remaining tests that failed with core.autocrlf=true t3901: move supporting files into t/t3901/ completion: mark bash script as LF-only git-new-workdir: mark script as LF-only Fix build with core.autocrlf=true 04 June 2017, 01:21:04 UTC
970fb22 Junio C Hamano 04 June 2017, 01:21:04 UTC Merge branch 'jk/update-links-in-docs' into maint A few http:// links that are redirected to https:// in the documentation have been updated to https:// links. * jk/update-links-in-docs: doc: use https links to Wikipedia to avoid http redirects 04 June 2017, 01:21:04 UTC
8d958b9 Junio C Hamano 04 June 2017, 01:21:03 UTC Merge branch 'jk/ignore-broken-tags-when-ignoring-missing-links' into maint Tag objects, which are not reachable from any ref, that point at missing objects were mishandled by "git gc" and friends (they should silently be ignored instead) * jk/ignore-broken-tags-when-ignoring-missing-links: revision.c: ignore broken tags with ignore_missing_links 04 June 2017, 01:21:03 UTC
aa5439d Junio C Hamano 04 June 2017, 01:21:02 UTC Merge branch 'jk/doc-config-include' into maint Clarify documentation for include.path and includeIf.<condition>.path configuration variables. * jk/doc-config-include: docs/config: consistify include.path examples docs/config: avoid the term "expand" for includes docs/config: give a relative includeIf example docs/config: clarify include/includeIf relationship 04 June 2017, 01:21:02 UTC
f305016 Junio C Hamano 04 June 2017, 01:21:02 UTC Merge branch 'jk/disable-pack-reuse-when-broken' into maint "pack-objects" can stream a slice of an existing packfile out when the pack bitmap can tell that the reachable objects are all needed in the output, without inspecting individual objects. This strategy however would not work well when "--local" and other options are in use, and need to be disabled. * jk/disable-pack-reuse-when-broken: t5310: fix "; do" style pack-objects: disable pack reuse for object-selection options 04 June 2017, 01:21:02 UTC
70d19a4 Junio C Hamano 04 June 2017, 01:21:01 UTC Merge branch 'jk/am-leakfix' into maint The codepath in "git am" that is used when running "git rebase" leaked memory held for the log message of the commits being rebased. * jk/am-leakfix: am: shorten ident_split variable name in get_commit_info() am: simplify allocations in get_commit_info() am: fix commit buffer leak in get_commit_info() 04 June 2017, 01:21:01 UTC
8a17b25 Junio C Hamano 04 June 2017, 01:21:00 UTC Merge branch 'jc/read-tree-empty-with-m' into maint "git read-tree -m" (no tree-ish) gave a nonsense suggestion "use --empty if you want to clear the index". With "-m", such a request will still fail anyway, as you'd need to name at least one tree-ish to be merged. * jc/read-tree-empty-with-m: read-tree: "read-tree -m --empty" does not make sense 04 June 2017, 01:21:00 UTC
34a75cc Junio C Hamano 04 June 2017, 01:20:59 UTC Merge branch 'jc/apply-fix-mismerge' into maint Mismerge fix. * jc/apply-fix-mismerge: apply.c: fix whitespace-only mismerge 04 June 2017, 01:20:59 UTC
0501b7e Junio C Hamano 04 June 2017, 01:20:58 UTC Merge branch 'ja/do-not-ask-needless-questions' into maint Git sometimes gives an advice in a rhetorical question that does not require an answer, which can confuse new users and non native speakers. Attempt to rephrase them. * ja/do-not-ask-needless-questions: git-filter-branch: be more direct in an error message read-tree -m: make error message for merging 0 trees less smart aleck usability: don't ask questions if no reply is required 04 June 2017, 01:20:59 UTC
c95f0d2 Junio C Hamano 04 June 2017, 01:20:58 UTC Merge branch 'bw/submodule-with-bs-path' into maint A hotfix to a topic that is already in v2.13. * bw/submodule-with-bs-path: t7400: add !CYGWIN prerequisite to 'add with \\ in path' 04 June 2017, 01:20:58 UTC
fb11de9 Junio C Hamano 04 June 2017, 01:20:57 UTC Merge branch 'ah/log-decorate-default-to-auto' into maint Setting "log.decorate=false" in the configuration file did not take effect in v2.13, which has been corrected. * ah/log-decorate-default-to-auto: builtin/log: honor log.decorate 04 June 2017, 01:20:57 UTC
6c940eb Junio C Hamano 04 June 2017, 01:20:56 UTC Merge branch 'ab/fix-poison-tests' into maint Update tests to pass under GETTEXT_POISON (a mechanism to ensure that output strings that should not be translated are not translated by mistake), and tell TravisCI to run them. * ab/fix-poison-tests: travis-ci: add job to run tests with GETTEXT_POISON travis-ci: setup "prove cache" in "script" step tests: fix tests broken under GETTEXT_POISON=YesPlease 04 June 2017, 01:20:56 UTC
16b4a48 Junio C Hamano 04 June 2017, 01:20:56 UTC Merge branch 'ab/doc-replace-gmane-links' into maint The Web interface to gmane news archive is long gone, even though the articles are still accessible via NTTP. Replace the links with ones to public-inbox.org. Because their message identification is based on the actual message-id, it is likely that it will be easier to migrate away from it if/when necessary. * ab/doc-replace-gmane-links: doc: replace more gmane links doc: replace a couple of broken gmane links 04 June 2017, 01:20:56 UTC
9102f42 Junio C Hamano 04 June 2017, 01:20:56 UTC Merge branch 'ab/aix-needs-compat-regex' into maint Build fix. * ab/aix-needs-compat-regex: config.mak.uname: set NO_REGEX=NeedsStartEnd on AIX 04 June 2017, 01:20:56 UTC
19a23d6 Junio C Hamano 04 June 2017, 01:20:55 UTC Merge branch 'pw/rebase-i-regression-fix' into maint Just the first one of three? new tests that follows up a regression fix. * pw/rebase-i-regression-fix: rebase -i: add missing newline to end of message rebase -i: silence stash apply rebase -i: fix reflog message 04 June 2017, 01:20:55 UTC
0c79cee Adam Dinwoodie 01 June 2017, 10:37:03 UTC docs: fix formatting and grammar When compiling the documentation, asciidoc thinks a backtick surrounded by whitespace shouldn't be interpreted as marking the start or end of a literal. In most cases, that's useful behaviour, but in the git-pull documentation it means asciidoc is failing to correctly detect which text should be monospaced and which shouldn't. To avoid this, remove the extraneous spaces from the text to be monospaced. It would also be possible to fix the formatting by switching to asciidoc's ++ monospace format markers and still have the space characters included in the monospace text, but the spaces aren't necessary and not having them keeps the markup simpler. Also include a minor grammar fix suggested by Jeff while we're changing these lines. Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 June 2017, 05:10:57 UTC
8ba74bf Junio C Hamano 02 June 2017, 02:34:15 UTC diff-tree: update stale in-code comments Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 June 2017, 02:34:15 UTC
f15e7cf Tyler Brazier 01 June 2017, 04:18:36 UTC pull: ff --rebase --autostash works in dirty repo When `git pull --rebase --autostash` in a dirty repository resulted in a fast-forward, nothing was being autostashed and the pull failed. This was due to a shortcut to avoid running rebase when we can fast-forward, but autostash is ignored on that codepath. Now we will only take the shortcut if autostash is not in effect. Based on a few tests against the git.git repo, the shortcut does not seem to give us significant performance benefits, on Linux at least. Regardless, it is more important to be correct than to be fast. Signed-off-by: Tyler Brazier <tyler@tylerbrazier.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2017, 05:09:39 UTC
bfbfc9a Jonathan Nieder 01 June 2017, 00:17:43 UTC send-email: Net::SMTP::starttls was introduced in v2.34 We cannot rely on the starttls method being present in Net::SMTP until c274b798e6881a941d941808c6d89966975cb8c8 (Merge branch 'ipv6_ssl' of https://github.com/noxxi/perl-libnet into noxxi-ipv6_ssl, 2014-06-02), which set the module version to 2.34. This version was first shipped as part of perl in v5.21.5~169 (Update libnet to CPAN version 3.01, 2014-10-10). Noticed on an Ubuntu system with perl 5.18.2-2ubuntu1.1, which provides Net::SMTP version 2.31. The error message is Can't locate object method "starttls" via package "Net::SMTP" at /usr/lib/git-core/git-send-email line 1410. Reported-by: Brandon Williams <bmwill@google.com> Reported-and-tested-by: Eric Biggers <ebiggers3@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2017, 02:23:35 UTC
fb87327 Andreas Heiduk 31 May 2017, 21:39:29 UTC doc: rewrite description for rev-parse --short `git rev-parse --short` is not a generic modifier but just a variant of `--verify` and considers the given length only as a suggestion to ensure uniqueness. Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2017, 01:37:42 UTC
2c9a2ae Jeff King 31 May 2017, 05:18:04 UTC docs/config: mention protocol implications of url.insteadOf If a URL rewrite switches the protocol to something nonstandard (like "persistent-https" for "https"), the user may be bitten by the fact that the default protocol restrictions are different between the two. Let's drop a note in insteadOf that points the user in the right direction. It would be nice if we could make this work out of the box, but we can't without knowing the security implications of the user's rewrite. Only the documentation for a particular remote helper can advise one way or the other. Since we do include the persistent-https helper in contrib/ (and since it was the helper in the real-world case that inspired that patch), let's also drop a note there. Suggested-by: Elliott Cable <me@ell.io> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2017, 01:07:10 UTC
a56eea2 Jeff King 31 May 2017, 04:27:47 UTC remote: drop free_refspecs() function We already have free_refspec(), a public function which does the same thing as the static free_refspecs(). Let's just keep one. There are two minor differences between the functions: 1. free_refspecs() is a noop when the refspec argument is NULL. This probably doesn't matter in practice. The nr_refspec parameter would presumably be 0 in that case, skipping the loop. And free(NULL) is explicitly OK. But it doesn't hurt for us to port this extra safety to free_refspec(), as one of the callers passes a funny "i+1" count. 2. The order of arguments is reversed between the two functions. This patch uses the already-public order of free_refspec(), as it matches the argument order on the parsing side. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2017, 00:59:00 UTC
66f5f6d Ævar Arnfjörð Bjarmason 11 May 2017, 21:20:12 UTC C style: use standard style for "TRANSLATORS" comments Change all the "TRANSLATORS: [...]" comments in the C code to use the regular Git coding style, and amend the style guide so that the example there uses that style. This custom style was necessary back in 2010 when the gettext support was initially added, and was subsequently documented in commit cbcfd4e3ea ("i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines", 2014-04-18). GNU xgettext hasn't had the parsing limitation that necessitated this exception for almost 3 years. Since its 0.19 release on 2014-06-02 it's been able to recognize TRANSLATOR comments in the standard Git comment syntax[1]. Usually we'd like to keep compatibility with software that's that young, but in this case literally the only person who needs to be using a gettext newer than 3 years old is Jiang Xin (the only person who runs & commits "make pot" results), so I think in this case we can make an exception. This xgettext parsing feature was added after a thread on the Git mailing list[2] which continued on the bug-gettext[3] list, but we never subsequently changed our style & styleguide, do so. There are already longstanding changes in git that use the standard comment style & have their TRANSLATORS comments extracted properly without getting the literal "*"'s mixed up in the text, as would happen before xgettext 0.19. Commit 7ff2683253 ("builtin-am: implement -i/--interactive", 2015-08-04) added one such comment, which in commit df0617bfa7 ("l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)", 2015-09-05) got picked up in the po/git.pot file with the right format, showing that Jiang already runs a modern xgettext. The xgettext parser does not handle the sort of non-standard comment style that I'm amending here in sequencer.c, but that isn't standard Git comment syntax anyway. With this change to sequencer.c & "make pot" the comment in the pot file is now correct: #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. * "rebase -i". +#. "rebase -i". 1. http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=10af7fe6bd 2. <2ce9ec406501d112e032c8208417f8100bed04c6.1397712142.git.worldhello.net@gmail.com> (https://public-inbox.org/git/2ce9ec406501d112e032c8208417f8100bed04c6.1397712142.git.worldhello.net@gmail.com/) 3. https://lists.gnu.org/archive/html/bug-gettext/2014-04/msg00016.html Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 May 2017, 23:01:42 UTC
f3a2fff Jeff King 30 May 2017, 05:11:23 UTC am: handle "-h" argument earlier If the user provides "-h" on the command line, then our parse_options() invocation will show a usage message and quit. But if "-h" is the only argument, the git wrapper behaves specially: it ignores our RUN_SETUP flag and calls cmd_am() without having done repository setup at all. This is due to 99caeed05 (Let 'git <command> -h' show usage without a git dir, 2009-11-09). Before cmd_am() calls parse_options(), though, it runs a few other setup functions. One of these is am_state_init(), which uses git_pathdup() to set up the default rebase-apply path. But calling git_pathdup() when we haven't done repository setup will fall back to using ".git". That's mostly harmless (since we won't use the value anyway), but is forbidden since b1ef400eec ("setup_git_env: avoid blind fall-back to ".git"", 2016-10-20), and we now BUG(). We can't easily move that setup to after the parse_options() call; the point is to set up defaults that are overwritten by the option parsing. Instead, we'll detect the "-h" case early and show the usage then. This matches the behavior of other builtins which have a similar setup-ordering issue (e.g., git-branch). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 May 2017, 05:39:47 UTC
9ee4aa9 Rikard Falkeborn 28 May 2017, 12:13:25 UTC completion: add completions for git config commit Add missing completions for git config: * commit.cleanup * commit.gpgSign * commit.verbose Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 May 2017, 04:29:38 UTC
b8f354f Sahil Dua 28 May 2017, 17:12:16 UTC branch test: fix invalid config key access Fixes the test by changing "branch.s/s/dummy" to "branch.s/s.dummy" which is the right way of accessing config key "branch.s/s.dummy". Purpose of this test is to confirm that this key doesn't exist after the branch "s/s" has been renamed to "s". Earlier it was trying to access invalid config key and hence was getting an error. However, this wasn't caught because we were expecting the command to fail for other reason as mentioned above. Signed-off-by: Sahil Dua <sahildua2305@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 May 2017, 04:18:43 UTC
44e2ff0 Ævar Arnfjörð Bjarmason 26 May 2017, 20:56:57 UTC wildmatch test: remove redundant duplicate test Remove a test line that's exactly the same as the preceding line. This was brought in in commit feabcc173b ("Integrate wildmatch to git", 2012-10-15), these tests are originally copied from rsync.git, but the duplicate line was never present there, so must have just snuck in during integration with git by accident. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 May 2017, 00:54:15 UTC
ba746ff Andreas Heiduk 26 May 2017, 17:36:54 UTC doc: filter-branch does not require re-export of vars The function `set_ident` in `filter-branch` exported the variables GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL|DATE) at least since 6f6826c52b in 2007. Therefore the filter scripts don't need to re-eport them again. Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 May 2017, 23:53:38 UTC
back to top