| 6406bdc | Junio C Hamano | 03 October 2016, 20:24:18 UTC | Git 2.10.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 October 2016, 20:24:18 UTC |
| 11738dd | Junio C Hamano | 03 October 2016, 20:22:32 UTC | Merge branch 'jk/ident-ai-canonname-could-be-null' into maint In the codepath that comes up with the hostname to be used in an e-mail when the user didn't tell us, we looked at ai_canonname field in struct addrinfo without making sure it is not NULL first. * jk/ident-ai-canonname-could-be-null: ident: handle NULL ai_canonname | 03 October 2016, 20:22:32 UTC |
| 3d0049e | Junio C Hamano | 03 October 2016, 20:22:25 UTC | Merge branch 'jk/doc-cvs-update' into maint Documentation around tools to import from CVS was fairly outdated. * jk/doc-cvs-update: docs/cvs-migration: mention cvsimport caveats docs/cvs-migration: update link to cvsps homepage docs/cvsimport: prefer cvs-fast-export to parsecvs | 03 October 2016, 20:22:25 UTC |
| f4315ee | Junio C Hamano | 03 October 2016, 20:22:13 UTC | Merge branch 'jk/pack-tag-of-tag' into maint "git pack-objects --include-tag" was taught that when we know that we are sending an object C, we want a tag B that directly points at C but also a tag A that points at the tag B. We used to miss the intermediate tag B in some cases. * jk/pack-tag-of-tag: pack-objects: walk tag chains for --include-tag t5305: simplify packname handling t5305: use "git -C" t5305: drop "dry-run" of unpack-objects t5305: move cleanup into test block | 03 October 2016, 20:22:13 UTC |
| 92d4266 | Junio C Hamano | 29 September 2016, 23:51:09 UTC | Prepare for 2.10.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 September 2016, 23:52:15 UTC |
| 36f6403 | Junio C Hamano | 29 September 2016, 23:49:47 UTC | Merge branch 'tg/add-chmod+x-fix' into maint "git add --chmod=+x <pathspec>" added recently only toggled the executable bit for paths that are either new or modified. This has been corrected to flip the executable bit for all paths that match the given pathspec. * tg/add-chmod+x-fix: t3700-add: do not check working tree file mode without POSIXPERM t3700-add: create subdirectory gently add: modify already added files when --chmod is given read-cache: introduce chmod_index_entry update-index: add test for chmod flags | 29 September 2016, 23:49:47 UTC |
| bf3a55a | Junio C Hamano | 29 September 2016, 23:49:46 UTC | Merge branch 'et/add-chmod-x' into maint "git add --chmod=+x" added recently lacked documentation, which has been corrected. * et/add-chmod-x: add: document the chmod option | 29 September 2016, 23:49:46 UTC |
| cec5f0b | Junio C Hamano | 29 September 2016, 23:49:46 UTC | Merge branch 'rt/rebase-i-broken-insn-advise' into maint When "git rebase -i" is given a broken instruction, it told the user to fix it with "--edit-todo", but didn't say what the step after that was (i.e. "--continue"). * rt/rebase-i-broken-insn-advise: rebase -i: improve advice on bad instruction lines | 29 September 2016, 23:49:46 UTC |
| d2a4131 | Junio C Hamano | 29 September 2016, 23:49:45 UTC | Merge branch 'ls/travis-homebrew-path-fix' into maint The procedure to build Git on Mac OS X for Travis CI hardcoded the internal directory structure we assumed HomeBrew uses, which was a no-no. The procedure has been updated to ask HomeBrew things we need to know to fix this. * ls/travis-homebrew-path-fix: travis-ci: ask homebrew for its path instead of hardcoding it | 29 September 2016, 23:49:45 UTC |
| 300e95f | Junio C Hamano | 29 September 2016, 23:49:44 UTC | Merge branch 'js/regexec-buf' into maint Some codepaths in "git diff" used regexec(3) on a buffer that was mmap(2)ed, which may not have a terminating NUL, leading to a read beyond the end of the mapped region. This was fixed by introducing a regexec_buf() helper that takes a <ptr,len> pair with REG_STARTEND extension. * js/regexec-buf: regex: use regexec_buf() regex: add regexec_buf() that can work on a non NUL-terminated string regex: -G<pattern> feeds a non NUL-terminated string to regexec() and fails | 29 September 2016, 23:49:45 UTC |
| d336b67 | Junio C Hamano | 29 September 2016, 23:49:43 UTC | Merge branch 'nd/checkout-disambiguation' into maint "git checkout <word>" does not follow the usual disambiguation rules when the <word> can be both a rev and a path, to allow checking out a branch 'foo' in a project that happens to have a file 'foo' in the working tree without having to disambiguate. This was poorly documented and the check was incorrect when the command was run from a subdirectory. * nd/checkout-disambiguation: checkout: fix ambiguity check in subdir checkout.txt: document a common case that ignores ambiguation rules checkout: add some spaces between code and comment | 29 September 2016, 23:49:44 UTC |
| 7106584 | Junio C Hamano | 29 September 2016, 23:49:43 UTC | Merge branch 'ep/doc-check-ref-format-example' into maint A shell script example in check-ref-format documentation has been fixed. * ep/doc-check-ref-format-example: git-check-ref-format.txt: fixup documentation | 29 September 2016, 23:49:43 UTC |
| a74a3b7 | Junio C Hamano | 29 September 2016, 23:49:42 UTC | Merge branch 'mm/config-color-ui-default-to-auto' into maint Documentation for individual configuration variables to control use of color (like `color.grep`) said that their default value is 'false', instead of saying their default is taken from `color.ui`. When we updated the default value for color.ui from 'false' to 'auto' quite a while ago, all of them broke. This has been corrected. * mm/config-color-ui-default-to-auto: Documentation/config: default for color.* is color.ui | 29 September 2016, 23:49:42 UTC |
| eb293ac | Junio C Hamano | 29 September 2016, 23:49:42 UTC | Merge branch 'jk/reduce-gc-aggressive-depth' into maint "git gc --aggressive" used to limit the delta-chain length to 250, which is way too deep for gaining additional space savings and is detrimental for runtime performance. The limit has been reduced to 50. * jk/reduce-gc-aggressive-depth: gc: default aggressive depth to 50 | 29 September 2016, 23:49:42 UTC |
| e25e6f3 | Junio C Hamano | 29 September 2016, 23:49:41 UTC | Merge branch 'jk/rebase-i-drop-ident-check' into maint Even when "git pull --rebase=preserve" (and the underlying "git rebase --preserve") can complete without creating any new commit (i.e. fast-forwards), it still insisted on having a usable ident information (read: user.email is set correctly), which was less than nice. As the underlying commands used inside "git rebase" would fail with a more meaningful error message and advice text when the bogus ident matters, this extra check was removed. * jk/rebase-i-drop-ident-check: rebase-interactive: drop early check for valid ident | 29 September 2016, 23:49:41 UTC |
| 7b7e977 | Junio C Hamano | 29 September 2016, 23:49:40 UTC | Merge branch 'jt/format-patch-base-info-above-sig' into maint "git format-patch --base=..." feature that was recently added showed the base commit information after "-- " e-mail signature line, which turned out to be inconvenient. The base information has been moved above the signature line. * jt/format-patch-base-info-above-sig: format-patch: show base info before email signature | 29 September 2016, 23:49:40 UTC |
| 08d0f7a | Junio C Hamano | 29 September 2016, 23:49:40 UTC | Merge branch 'ks/perf-build-with-autoconf' into maint Performance tests done via "t/perf" did not use the same set of build configuration if the user relied on autoconf generated configuration. * ks/perf-build-with-autoconf: t/perf/run: copy config.mak.autogen & friends to build area | 29 September 2016, 23:49:40 UTC |
| ef4f0ca | Junio C Hamano | 29 September 2016, 23:49:39 UTC | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint "git diff -W" output needs to extend the context backward to include the header line of the current function and also forward to include the body of the entire current function up to the header line of the next one. This process may have to merge to adjacent hunks, but the code forgot to do so in some cases. * rs/xdiff-merge-overlapping-hunks-for-W-context: xdiff: fix merging of hunks with -W context and -u context | 29 September 2016, 23:49:39 UTC |
| e007a09 | Junio C Hamano | 29 September 2016, 23:49:39 UTC | Merge branch 'ew/http-do-not-forget-to-call-curl-multi-remove-handle' into maint The http transport (with curl-multi option, which is the default these days) failed to remove curl-easy handle from a curlm session, which led to unnecessary API failures. * ew/http-do-not-forget-to-call-curl-multi-remove-handle: http: always remove curl easy from curlm session on release http: consolidate #ifdefs for curl_multi_remove_handle http: warn on curl_multi_add_handle failures | 29 September 2016, 23:49:39 UTC |
| 35ca3e5 | Junio C Hamano | 29 September 2016, 23:49:38 UTC | Merge branch 'jk/patch-ids-no-merges' into maint "git log --cherry-pick" used to include merge commits as candidates to be matched up with other commits, resulting a lot of wasted time. The patch-id generation logic has been updated to ignore merges to avoid the wastage. * jk/patch-ids-no-merges: patch-ids: refuse to compute patch-id for merge commit patch-ids: turn off rename detection | 29 September 2016, 23:49:38 UTC |
| d7e74c9 | Junio C Hamano | 29 September 2016, 23:49:38 UTC | Merge branch 'js/git-gui-commit-gpgsign' into maint "git commit-tree" stopped reading commit.gpgsign configuration variable that was meant for Porcelain "git commit" in Git 2.9; we forgot to update "git gui" to look at the configuration to match this change. * js/git-gui-commit-gpgsign: git-gui: respect commit.gpgsign again | 29 September 2016, 23:49:38 UTC |
| 35ec7fd | Junio C Hamano | 29 September 2016, 23:49:38 UTC | Merge branch 'jk/fix-remote-curl-url-wo-proto' into maint "git fetch http::/site/path" did not die correctly and segfaulted instead. * jk/fix-remote-curl-url-wo-proto: remote-curl: handle URLs without protocol | 29 September 2016, 23:49:38 UTC |
| 8183592 | Junio C Hamano | 29 September 2016, 23:49:37 UTC | Merge branch 'sy/git-gui-i18n-ja' into maint Update Japanese translation for "git-gui". * sy/git-gui-i18n-ja: git-gui: update Japanese information git-gui: update Japanese translation git-gui: add Japanese language code git-gui: apply po template to Japanese translation git-gui: consistently use the same word for "blame" in Japanese git-gui: consistently use the same word for "remote" in Japanese | 29 September 2016, 23:49:37 UTC |
| 7333629 | Junio C Hamano | 29 September 2016, 23:49:37 UTC | Merge branch 'mr/vcs-svn-printf-ulong' into maint Code cleanup. * mr/vcs-svn-printf-ulong: vcs-svn/fast_export: fix timestamp fmt specifiers | 29 September 2016, 23:49:37 UTC |
| 633212b | Junio C Hamano | 29 September 2016, 23:49:36 UTC | Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maint Code cleanup. * rs/unpack-trees-reduce-file-scope-global: unpack-trees: pass checkout state explicitly to check_updates() | 29 September 2016, 23:49:36 UTC |
| b0af481 | Junio C Hamano | 29 September 2016, 23:49:35 UTC | Merge branch 'rs/strbuf-remove-fix' into maint Code cleanup. * rs/strbuf-remove-fix: strbuf: use valid pointer in strbuf_remove() | 29 September 2016, 23:49:35 UTC |
| 3a3bb36 | Junio C Hamano | 29 September 2016, 23:49:35 UTC | Merge branch 'rs/checkout-some-states-are-const' into maint Code cleanup. * rs/checkout-some-states-are-const: checkout: constify parameters of checkout_stage() and checkout_merged() | 29 September 2016, 23:49:35 UTC |
| 9e2c4fa | Junio C Hamano | 29 September 2016, 23:49:34 UTC | Merge branch 'bw/pathspec-remove-unused-extern-decl' into maint Code cleanup. * bw/pathspec-remove-unused-extern-decl: pathspec: remove unnecessary function prototypes | 29 September 2016, 23:49:34 UTC |
| c375a7e | Jeff King | 23 September 2016, 04:37:53 UTC | ident: handle NULL ai_canonname We call getaddrinfo() to try to convert a short hostname into a fully-qualified one (to use it as an email domain). If there isn't a canonical name, getaddrinfo() will generally return either a NULL addrinfo list, or one in which ai->ai_canonname is a copy of the original name. However, if the result of gethostname() looks like an IP address, then getaddrinfo() behaves differently on some systems. On OS X, it will return a "struct addrinfo" with a NULL ai_canonname, and we segfault feeding it to strchr(). This is hard to test reliably because it involves not only a system where we we have to fallback to gethostname() to come up with an ident, but also where the hostname is a number with no dots. But I was able to replicate the bug by faking a hostname, like: diff --git a/ident.c b/ident.c index e20a772..b790d28 100644 --- a/ident.c +++ b/ident.c @@ -128,6 +128,7 @@ static void add_domainname(struct strbuf *out, int *is_bogus) *is_bogus = 1; return; } + xsnprintf(buf, sizeof(buf), "1"); if (strchr(buf, '.')) strbuf_addstr(out, buf); else if (canonical_name(buf, out) < 0) { and running "git var GIT_AUTHOR_IDENT" on an OS X system. Before this patch it segfaults, and after we correctly complain of the bogus "user@1.(none)" address (though this bogus address would be suitable for non-object uses like writing reflogs). Reported-by: Jonas Thiel <jonas.lierschied@gmx.de> Diagnosed-by: John Keeping <john@keeping.me.uk> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2016, 17:01:15 UTC |
| 106b672 | Jeff King | 22 September 2016, 07:26:28 UTC | docs/cvs-migration: mention cvsimport caveats Back when this guide was written, cvsimport was the only game in town. These days it is probably not the best option. Rather than go into details, let's point people to the note at the top of cvsimport which gives other options. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2016, 18:23:45 UTC |
| 72e0877 | Jeff King | 22 September 2016, 07:26:07 UTC | docs/cvs-migration: update link to cvsps homepage The old page gives a 404 now. Searching for "cvsps" via Google returns a GitHub project page as the top hit. Reported-by: Dan Pritts Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2016, 18:23:45 UTC |
| 1eba3e5 | Jeff King | 22 September 2016, 07:25:28 UTC | docs/cvsimport: prefer cvs-fast-export to parsecvs parsecvs maintenance was taken over by ESR, and the name changed to cvs-fast-export as it learned to support that output format. Let's point to cvs-fast-export, as it should have additional bug-fixes and be more convenient to use. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2016, 18:23:45 UTC |
| f86f49b | Lars Schneider | 21 September 2016, 08:45:18 UTC | travis-ci: ask homebrew for its path instead of hardcoding it The TravisCI macOS build is broken because homebrew (a macOS dependency manager) changed its internal directory structure [1]. This is a problem because we modify the Perforce dependencies in the homebrew repository before installing them. Fix it by asking homebrew for its path instead of hardcoding it. [1] https://github.com/Homebrew/brew/commit/0a09ae30f8b6117ad699b4a0439010738989c547 Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2016, 17:23:01 UTC |
| 40e0dc1 | Johannes Sixt | 20 September 2016, 06:18:25 UTC | t3700-add: do not check working tree file mode without POSIXPERM A recently introduced test checks the result of 'git status' after setting the executable bit on a file. This check does not yield the expected result when the filesystem does not support the executable bit. What we care about is that a file added with "--chmod=+x" has executable bit in the index and that "--chmod=+x" (or any other options for that matter) does not muck with working tree files. The former is tested by other existing tests, so let's check the latter more explicitly and only under POSIXPERM prerequisite. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2016, 21:09:54 UTC |
| b7d36ff | Johannes Schindelin | 21 September 2016, 18:24:14 UTC | regex: use regexec_buf() The new regexec_buf() function operates on buffers with an explicitly specified length, rather than NUL-terminated strings. We need to use this function whenever the buffer we want to pass to regexec(3) may have been mmap(2)ed (and is hence not NUL-terminated). Note: the original motivation for this patch was to fix a bug where `git diff -G <regex>` would crash. This patch converts more callers, though, some of which allocated to construct NUL-terminated strings, or worse, modified buffers to temporarily insert NULs while calling regexec(3). By converting them to use regexec_buf(), the code has become much cleaner. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2016, 20:56:15 UTC |
| 2f89522 | Johannes Schindelin | 21 September 2016, 18:24:04 UTC | regex: add regexec_buf() that can work on a non NUL-terminated string We just introduced a test that demonstrates that our sloppy use of regexec() on a mmap()ed area can result in incorrect results or even hard crashes. So what we need to fix this is a function that calls regexec() on a length-delimited, rather than a NUL-terminated, string. Happily, there is an extension to regexec() introduced by the NetBSD project and present in all major regex implementation including Linux', MacOSX' and the one Git includes in compat/regex/: by using the (non-POSIX) REG_STARTEND flag, it is possible to tell the regexec() function that it should only look at the offsets between pmatch[0].rm_so and pmatch[0].rm_eo. That is exactly what we need. Since support for REG_STARTEND is so widespread by now, let's just introduce a helper function that always uses it, and tell people on a platform whose regex library does not support it to use the one from our compat/regex/ directory. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2016, 20:56:15 UTC |
| db5dfa3 | Johannes Schindelin | 21 September 2016, 18:23:22 UTC | regex: -G<pattern> feeds a non NUL-terminated string to regexec() and fails When our pickaxe code feeds file contents to regexec(), it implicitly assumes that the file contents are read into implicitly NUL-terminated buffers (i.e. that we overallocate by 1, appending a single '\0'). This is not so. In particular when the file contents are simply mmap()ed, we can be virtually certain that the buffer is preceding uninitialized bytes, or invalid pages. Note that the test we add here is known to be flakey: we simply cannot know whether the byte following the mmap()ed ones is a NUL or not. Typically, on Linux the test passes. On Windows, it fails virtually every time due to an access violation (that's a segmentation fault for you Unix-y people out there). And Windows would be correct: the regexec() call wants to operate on a regular, NUL-terminated string, there is no NUL in the mmap()ed memory range, and it is undefined whether the next byte is even legal to access. When run with --valgrind it demonstrates quite clearly the breakage, of course. Being marked with `test_expect_failure`, this test will sometimes be declare "TODO fixed", even if it only passes by mistake. This test case represents a Minimal, Complete and Verifiable Example of a breakage reported by Chris Sidi. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2016, 20:56:15 UTC |
| 92dece7 | Elia Pinto | 20 September 2016, 07:33:14 UTC | git-check-ref-format.txt: fixup documentation die is not a standard shell function. Use a different shell code for the example. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2016, 18:12:41 UTC |
| b07ad46 | Johannes Sixt | 20 September 2016, 06:16:11 UTC | t3700-add: create subdirectory gently The subdirectory 'sub' is created early in the test file. Later, a test case removes it during its clean-up actions. However, this test case is protected by POSIXPERM. Consequently, 'sub' remains when the POSIXPERM prerequisite is not satisfied. Later, a recently introduced test case creates 'sub' again. Use -p with mkdir so that it does not fail if 'sub' already exists. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2016, 18:05:35 UTC |
| b829b94 | Nguyễn Thái Ngọc Duy | 07 September 2016, 11:19:41 UTC | checkout: fix ambiguity check in subdir The two functions in parse_branchname_arg(), verify_non_filename and check_filename, need correct prefix in order to reconstruct the paths and check for their existence. With NULL prefix, they just check paths at top dir instead. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2016, 15:44:41 UTC |
| 19e5656 | Nguyễn Thái Ngọc Duy | 07 September 2016, 11:19:40 UTC | checkout.txt: document a common case that ignores ambiguation rules Normally we err on the safe side: if something can be seen as both an SHA1 and a pathspec, we stop and scream. In checkout, there is one exception added in 859fdab (git-checkout: improve error messages, detect ambiguities. - 2008-07-23), to allow the common case "git checkout branch". Let's document this exception. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2016, 15:44:41 UTC |
| 7c0304a | Junio C Hamano | 19 September 2016, 20:54:50 UTC | Start preparing for 2.10.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2016, 20:54:50 UTC |
| ddf8ee8 | Junio C Hamano | 19 September 2016, 20:51:45 UTC | Merge branch 'sb/diff-cleanup' into maint Code cleanup. * sb/diff-cleanup: diff: remove dead code diff: omit found pointer from emit_callback diff.c: use diff_options directly | 19 September 2016, 20:51:45 UTC |
| 9f3d73e | Junio C Hamano | 19 September 2016, 20:51:45 UTC | Merge branch 'ah/misc-message-fixes' into maint Message cleanup. * ah/misc-message-fixes: unpack-trees: do not capitalize "working" git-merge-octopus: do not capitalize "octopus" git-rebase--interactive: fix English grammar cat-file: put spaces around pipes in usage string am: put spaces around pipe in usage string | 19 September 2016, 20:51:45 UTC |
| 0303939 | Junio C Hamano | 19 September 2016, 20:51:45 UTC | Merge branch 'sb/transport-report-missing-submodule-on-stderr' into maint Message cleanup. * sb/transport-report-missing-submodule-on-stderr: transport: report missing submodule pushes consistently on stderr | 19 September 2016, 20:51:45 UTC |
| 51673a7 | Junio C Hamano | 19 September 2016, 20:51:44 UTC | Merge branch 'sb/xdiff-remove-unused-static-decl' into maint Code cleanup. * sb/xdiff-remove-unused-static-decl: xdiff: remove unneeded declarations | 19 September 2016, 20:51:45 UTC |
| 294573e | Junio C Hamano | 19 September 2016, 20:51:44 UTC | Merge branch 'js/t9903-chaining' into maint Test fix. * js/t9903-chaining: t9903: fix broken && chain | 19 September 2016, 20:51:44 UTC |
| c3befae | Junio C Hamano | 19 September 2016, 20:51:43 UTC | Merge branch 'rs/hex2chr' into maint Code cleanup. * rs/hex2chr: introduce hex2chr() for converting two hexadecimal digits to a character | 19 September 2016, 20:51:43 UTC |
| 815a73f | Junio C Hamano | 19 September 2016, 20:51:42 UTC | Merge branch 'rs/compat-strdup' into maint Code cleanup. * rs/compat-strdup: compat: move strdup(3) replacement to its own file | 19 September 2016, 20:51:42 UTC |
| 3d54b93 | Junio C Hamano | 19 September 2016, 20:51:41 UTC | Merge branch 'jk/squelch-false-warning-from-gcc-o3' into maint Compilation fix. * jk/squelch-false-warning-from-gcc-o3: color_parse_mem: initialize "struct color" temporary error_errno: use constant return similar to error() | 19 September 2016, 20:51:41 UTC |
| 1e28677 | Junio C Hamano | 19 September 2016, 20:51:41 UTC | Merge branch 'ep/use-git-trace-curl-in-tests' into maint Update a few tests that used to use GIT_CURL_VERBOSE to use the newer GIT_TRACE_CURL. * ep/use-git-trace-curl-in-tests: t5551-http-fetch-smart.sh: use the GIT_TRACE_CURL environment var t5550-http-fetch-dumb.sh: use the GIT_TRACE_CURL environment var test-lib.sh: preserve GIT_TRACE_CURL from the environment t5541-http-push-smart.sh: use the GIT_TRACE_CURL environment var | 19 September 2016, 20:51:41 UTC |
| 8e26535 | Junio C Hamano | 19 September 2016, 20:51:41 UTC | Merge branch 'js/t6026-clean-up' into maint A test spawned a short-lived background process, which sometimes prevented the test directory from getting removed at the end of the script on some platforms. * js/t6026-clean-up: t6026-merge-attr: clean up background process at end of test case | 19 September 2016, 20:51:41 UTC |
| d664531 | Junio C Hamano | 19 September 2016, 20:51:40 UTC | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maint "git symbolic-ref -d HEAD" happily removes the symbolic ref, but the resulting repository becomes an invalid one. Teach the command to forbid removal of HEAD. * jc/forbid-symbolic-ref-d-HEAD: symbolic-ref -d: do not allow removal of HEAD | 19 September 2016, 20:51:41 UTC |
| 4c10c31 | Junio C Hamano | 19 September 2016, 20:51:40 UTC | Merge branch 'jc/submodule-anchor-git-dir' into maint Having a submodule whose ".git" repository is somehow corrupt caused a few commands that recurse into submodules loop forever. * jc/submodule-anchor-git-dir: submodule: avoid auto-discovery in prepare_submodule_repo_env() | 19 September 2016, 20:51:40 UTC |
| 79b51eb | Junio C Hamano | 19 September 2016, 20:51:39 UTC | Merge branch 'jk/test-lib-drop-pid-from-results' into maint The test framework left the number of tests and success/failure count in the t/test-results directory, keyed by the name of the test script plus the process ID. The latter however turned out not to serve any useful purpose. The process ID part of the filename has been removed. * jk/test-lib-drop-pid-from-results: test-lib: drop PID from test-results/*.count | 19 September 2016, 20:51:39 UTC |
| 276661f | Junio C Hamano | 19 September 2016, 20:51:38 UTC | Merge branch 'bh/diff-highlight-graph' into maint "diff-highlight" script (in contrib/) learned to work better with "git log -p --graph" output. * bh/diff-highlight-graph: diff-highlight: avoid highlighting combined diffs diff-highlight: add multi-byte tests diff-highlight: ignore test cruft diff-highlight: add support for --graph output diff-highlight: add failing test for handling --graph output diff-highlight: add some tests | 19 September 2016, 20:51:38 UTC |
| f0b2db2 | Junio C Hamano | 19 September 2016, 20:51:37 UTC | Merge branch 'po/range-doc' into maint Clarify various ways to specify the "revision ranges" in the documentation. * po/range-doc: doc: revisions: sort examples and fix alignment of the unchanged doc: revisions: show revision expansion in examples doc: revisions - clarify reachability examples doc: revisions - define `reachable` doc: gitrevisions - clarify 'latter case' is revision walk doc: gitrevisions - use 'reachable' in page description doc: revisions: single vs multi-parent notation comparison doc: revisions: extra clarification of <rev>^! notation effects doc: revisions: give headings for the two and three dot notations doc: show the actual left, right, and boundary marks doc: revisions - name the left and right sides doc: use 'symmetric difference' consistently | 19 September 2016, 20:51:38 UTC |
| 14d16e2 | Matthieu Moy | 16 September 2016, 07:32:48 UTC | Documentation/config: default for color.* is color.ui Since 4c7f181 (make color.ui default to 'auto', 2013-06-10), the default for color.* when nothing is set is 'auto' and we still claimed that the default was 'false'. Be more precise by saying explicitly that the default is to follow color.ui, and recall that the default is 'auto' to avoid one indirection for the reader. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2016, 19:34:14 UTC |
| cd5c281 | Kirill Smelkov | 13 September 2016, 06:58:00 UTC | t/perf/run: copy config.mak.autogen & friends to build area Otherwise for people who use autotools-based configure in main worktree, the performance testing results will be inconsistent as work and build trees could be using e.g. different optimization levels. See e.g. http://public-inbox.org/git/20160818175222.bmm3ivjheokf2qzl@sigill.intra.peff.net/ for example. NOTE config.status has to be copied because otherwise without it the build would want to run reconfigure this way loosing just copied config.mak.autogen. Signed-off-by: Kirill Smelkov <kirr@nexedi.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 September 2016, 20:41:11 UTC |
| 610d55a | Thomas Gummerer | 14 September 2016, 21:07:47 UTC | add: modify already added files when --chmod is given When the chmod option was added to git add, it was hooked up to the diff machinery, meaning that it only works when the version in the index differs from the version on disk. As the option was supposed to mirror the chmod option in update-index, which always changes the mode in the index, regardless of the status of the file, make sure the option behaves the same way in git add. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 September 2016, 19:13:54 UTC |
| d9d7096 | Thomas Gummerer | 14 September 2016, 21:07:46 UTC | read-cache: introduce chmod_index_entry As there are chmod options for both add and update-index, introduce a new chmod_index_entry function to do the work. Use it in update-index, while it will be used in add in the next patch. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 September 2016, 19:13:54 UTC |
| 480871e | Josh Triplett | 08 September 2016, 01:12:01 UTC | format-patch: show base info before email signature Any text below the "-- " for the email signature gets treated as part of the signature, and many mail clients will trim it from the quoted text for a reply. Move it above the signature, so people can reply to it more easily. Similarly, when producing the patch as a MIME attachment, the original code placed the base info after the attached part, which would be discarded. Move the base info to the end of the part, still inside the part boundary. Add tests for the exact format of the email signature, and add tests to ensure that the base info appears before the email signature when producing a plain-text output, and that it appears before the part boundary when producing a MIME attachment. Signed-off-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 September 2016, 17:07:10 UTC |
| 45d2f75 | René Scharfe | 14 September 2016, 16:05:27 UTC | xdiff: fix merging of hunks with -W context and -u context If the function context for a hunk (with -W) reaches the beginning of the next hunk then we need to merge these two -- otherwise we'd show some lines twice, which looks strange and even confuses git apply. We already do this checking and merging in xdl_emit_diff(), but forget to consider regular context (with -u or -U). Fix that by merging hunks already if function context of the first one touches or overlaps regular context of the second one. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2016, 23:07:21 UTC |
| 22433ce | Thomas Gummerer | 14 September 2016, 21:07:45 UTC | update-index: add test for chmod flags Currently there is no test checking the expected behaviour when multiple chmod flags with different arguments are passed. As argument handling is not in line with other git commands it's easy to miss and accidentally change the current behaviour. While there, fix the argument type of chmod_path, which takes an int, but had a char passed in. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2016, 22:03:49 UTC |
| 840529d | Junio C Hamano | 14 September 2016, 22:02:25 UTC | Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fix Newly added tests to this topic uses helper functions that did not exist back when the bug being fixed by the topic was introduced. * ib/t3700-add-chmod-x-updates: t3700: add a test_mode_in_index helper function t3700: merge two tests into one t3700: remove unwanted leftover files before running new tests | 14 September 2016, 22:02:25 UTC |
| 5efc60c | Mike Ralphson | 14 September 2016, 06:40:57 UTC | vcs-svn/fast_export: fix timestamp fmt specifiers Two instances of %ld being used for unsigned longs Signed-off-by: Mike Ralphson <mike.ralphson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2016, 15:56:50 UTC |
| b56aa5b | René Scharfe | 13 September 2016, 17:37:06 UTC | unpack-trees: pass checkout state explicitly to check_updates() Add a parameter for the struct checkout variable to check_updates() instead of using a static global variable. Passing it explicitly makes object ownership and usage more easily apparent. And we get rid of a static variable; those can be problematic in library-like code. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2016, 23:26:12 UTC |
| ce25e4c | René Scharfe | 13 September 2016, 17:11:52 UTC | checkout: constify parameters of checkout_stage() and checkout_merged() Document the fact that checkout_stage() and checkout_merged() don't change the objects passed to them by adding the modifier const. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2016, 23:12:28 UTC |
| e78d57e | Brandon Williams | 13 September 2016, 16:52:51 UTC | pathspec: remove unnecessary function prototypes A few functions were removed in 5a76aff1 ("add: convert to use parse_pathspec", 2013-07-14), but we forgot to remove their external declarations from pathspec.h while doing so. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2016, 23:10:03 UTC |
| a8342a4 | René Scharfe | 13 September 2016, 16:40:22 UTC | strbuf: use valid pointer in strbuf_remove() The fourth argument of strbuf_splice() is passed to memcpy(3), which is not supposed to handle NULL pointers. Let's be extra careful and use a valid empty string instead. It even shortens the source code. :) Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2016, 23:07:37 UTC |
| 2abc848 | Eric Wong | 13 September 2016, 00:25:57 UTC | http: always remove curl easy from curlm session on release We must call curl_multi_remove_handle when releasing the slot to prevent subsequent calls to curl_multi_add_handle from failing with CURLM_ADDED_ALREADY (in curl 7.32.1+; older versions returned CURLM_BAD_EASY_HANDLE) Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2016, 20:34:04 UTC |
| d8b6b84 | Eric Wong | 13 September 2016, 00:25:56 UTC | http: consolidate #ifdefs for curl_multi_remove_handle I find #ifdefs makes code difficult-to-follow. An early version of this patch had error checking for curl_multi_remove_handle calls, but caused some tests (e.g. t5541) to fail under curl 7.26.0 on old Debian wheezy. Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2016, 20:34:03 UTC |
| 9f1b588 | Eric Wong | 13 September 2016, 00:25:55 UTC | http: warn on curl_multi_add_handle failures This will be useful for tracking down curl usage errors. Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2016, 20:34:01 UTC |
| 9194226 | Junio C Hamano | 12 September 2016, 22:23:42 UTC | Merge tag 'l10n-2.10.0-rnd2.3' of git://github.com/git-l10n/git-po into maint l10n-2.10.0-rnd2.3 * tag 'l10n-2.10.0-rnd2.3' of git://github.com/git-l10n/git-po: l10n: zh_CN: review for git v2.10.0 l10n l10n: zh_CN: fixed some typos for git 2.10.0 l10n: pt_PT: update Portuguese repository info l10n: pt_PT: update Portuguese translation | 12 September 2016, 22:23:42 UTC |
| 7ef7903 | Thomas Gummerer | 12 September 2016, 21:08:15 UTC | add: document the chmod option The git add --chmod option was introduced in 4e55ed3 ("add: add --chmod=+x / --chmod=-x options", 2016-05-31), but was never documented. Document the feature. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2016, 22:03:32 UTC |
| 7c81040 | Jeff King | 12 September 2016, 17:56:41 UTC | patch-ids: refuse to compute patch-id for merge commit The patch-id code which powers "log --cherry-pick" doesn't look at whether each commit is a merge or not. It just feeds the commit's first parent to the diff, and ignores any additional parents. In theory, this might be useful if you wanted to find equivalence between, say, a merge commit and a squash-merge that does the same thing. But it also promotes a false equivalence between distinct merges. For example, every "merge -s ours" would look identical to an empty commit (which is true in a sense, but presumably there was a value in merging in the discarded history). Since patch-ids are meant for throwing away duplicates, we should err on the side of _not_ matching such merges. Moreover, we may spend a lot of extra time computing these merge diffs. In the case that inspired this patch, a "git format-patch --cherry-pick" dropped from over 3 minutes to less than 3 seconds. This seems pretty drastic, but is easily explained. The command was invoked by a "git rebase" of an older topic branch; there had been tens of thousands of commits on the upstream branch in the meantime. In addition, this project used a topic-branch workflow with occasional "back-merges" from "master" to each topic (to resolve conflicts on the topics rather than in the merge commits). So there were not only extra merges, but the diffs for these back-merges were generally quite large (because they represented _everything_ that had been merged to master since the topic branched). This patch treats a merge fed to commit_patch_id() or add_commit_patch_id() as an error, and a lookup for such a merge via has_commit_patch_id() will always return NULL. An earlier version of the patch tried to distinguish between "error" and "patch id for merges not defined", but that becomes unnecessarily complicated. The only callers are: 1. revision traversals which want to do --cherry-pick; they call add_commit_patch_id(), but do not care if it fails. They only want to add what we can, look it up later with has_commit_patch_id(), and err on the side of not-matching. 2. format-patch --base, which calls commit_patch_id(). This _does_ notice errors, but should never feed a merge in the first place (and if it were to do so accidentally, then this patch is a strict improvement; we notice the bug rather than generating a bogus patch-id). So in both cases, this does the right thing. Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2016, 20:45:01 UTC |
| f14a310 | Junio C Hamano | 11 September 2016, 21:53:26 UTC | Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign * 'js/commit-gpgsign' of ../git-gui: git-gui: respect commit.gpgsign again | 11 September 2016, 21:54:46 UTC |
| 2afe6b7 | Johannes Schindelin | 09 September 2016, 12:28:24 UTC | git-gui: respect commit.gpgsign again As of v2.9.0, `git commit-tree` no longer heeds the `commit.gpgsign` config setting. This broke committing with GPG signature in Git GUI. This fixes https://github.com/git-for-windows/git/issues/850 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2016, 21:52:27 UTC |
| 9a4b694 | Ray Chen | 07 September 2016, 10:03:04 UTC | l10n: zh_CN: review for git v2.10.0 l10n Signed-off-by: Ray Chen <oldsharp@gmail.com> | 11 September 2016, 13:34:23 UTC |
| 7665d45 | Jiang Xin | 05 September 2016, 15:26:21 UTC | l10n: zh_CN: fixed some typos for git 2.10.0 Reviewed-by: Ray <tvvocold@163.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 11 September 2016, 13:31:51 UTC |
| 5a29cbc | Jeff King | 09 September 2016, 20:34:34 UTC | patch-ids: turn off rename detection The patch-id code may be running inside another porcelain like "git log" or "git format-patch", and therefore may have set diff_detect_rename_default, either via the diff-ui config, or by default since 5404c11 (diff: activate diff.renames by default, 2016-02-25). This is the case even if a command is run with `--no-renames`, as that is applied only to the diff-options used by the command itself. Rename detection doesn't help the patch-id results. It _may_ actually hurt, as minor differences in the files that would be overlooked by patch-id's canonicalization might result in different renames (though I'd doubt that it ever comes up in practice). But mostly it is just a waste of CPU to compute these renames. Note that this does have one user-visible impact: the prerequisite patches listed by "format-patch --base". There may be some confusion between different versions of git as older ones will enable renames, but newer ones will not. However, this was already a problem, as people with different settings for the "diff.renames" config would get different results. After this patch, everyone should get the same results, regardless of their config. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2016, 21:13:53 UTC |
| 49981d8 | Junio C Hamano | 09 September 2016, 04:39:38 UTC | Start maintenance track for 2.10.x series | 09 September 2016, 04:39:38 UTC |
| 0202c41 | Junio C Hamano | 09 September 2016, 04:37:59 UTC | Prepare for 2.9.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2016, 04:37:59 UTC |
| 3e8e69a | Junio C Hamano | 09 September 2016, 04:36:03 UTC | Merge branch 'hv/doc-commit-reference-style' into maint A small doc update. * hv/doc-commit-reference-style: SubmittingPatches: use gitk's "Copy commit summary" format SubmittingPatches: document how to reference previous commits | 09 September 2016, 04:36:03 UTC |
| b5abd30 | Junio C Hamano | 09 September 2016, 04:36:02 UTC | Merge branch 'sg/reflog-past-root' into maint A small test clean-up for a topic introduced in v2.9.1 and later. * sg/reflog-past-root: t1410: remove superfluous 'git reflog' from the 'walk past root' test | 09 September 2016, 04:36:02 UTC |
| 71165f0 | Junio C Hamano | 09 September 2016, 04:36:01 UTC | Merge branch 'rs/mailinfo-lib' into maint Small code clean-up. * rs/mailinfo-lib: mailinfo: recycle strbuf in check_header() | 09 September 2016, 04:36:01 UTC |
| 9bef642 | Junio C Hamano | 09 September 2016, 04:36:00 UTC | Merge branch 'jk/tighten-alloc' into maint Small code and comment clean-up. * jk/tighten-alloc: receive-pack: use FLEX_ALLOC_MEM in queue_command() correct FLEXPTR_* example in comment | 09 September 2016, 04:36:00 UTC |
| 5e469ab | Junio C Hamano | 09 September 2016, 04:35:59 UTC | Merge branch 'rs/use-strbuf-add-unique-abbrev' into maint A small code clean-up. * rs/use-strbuf-add-unique-abbrev: use strbuf_add_unique_abbrev() for adding short hashes | 09 September 2016, 04:36:00 UTC |
| f14883b | Junio C Hamano | 09 September 2016, 04:35:59 UTC | Merge branch 'rs/merge-recursive-string-list-init' into maint A small code clean-up. * rs/merge-recursive-string-list-init: merge-recursive: use STRING_LIST_INIT_NODUP | 09 September 2016, 04:35:59 UTC |
| 24c88ad | Junio C Hamano | 09 September 2016, 04:35:58 UTC | Merge branch 'rs/merge-add-strategies-simplification' into maint A small code clean-up. * rs/merge-add-strategies-simplification: merge: use string_list_split() in add_strategies() | 09 September 2016, 04:35:58 UTC |
| a75341c | Junio C Hamano | 09 September 2016, 04:35:57 UTC | Merge branch 'ls/packet-line-protocol-doc-fix' into maint Correct an age-old calco (is that a typo-like word for calc) in the documentation. * ls/packet-line-protocol-doc-fix: pack-protocol: fix maximum pkt-line size | 09 September 2016, 04:35:57 UTC |
| c0e8b3b | Junio C Hamano | 09 September 2016, 04:35:56 UTC | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maint The tempfile (hence its user lockfile) API lets the caller to open a file descriptor to a temporary file, write into it and then finalize it by first closing the filehandle and then either removing or renaming the temporary file. When the process spawns a subprocess after obtaining the file descriptor, and if the subprocess has not exited when the attempt to remove or rename is made, the last step fails on Windows, because the subprocess has the file descriptor still open. Open tempfile with O_CLOEXEC flag to avoid this (on Windows, this is mapped to O_NOINHERIT). * bw/mingw-avoid-inheriting-fd-to-lockfile: mingw: ensure temporary file handles are not inherited by child processes t6026-merge-attr: child processes must not inherit index.lock handles | 09 September 2016, 04:35:56 UTC |
| 15a2729 | Junio C Hamano | 09 September 2016, 04:35:56 UTC | Merge branch 'dg/document-git-c-in-git-config-doc' into maint The "git -c var[=val] cmd" facility to append a configuration variable definition at the end of the search order was described in git(1) manual page, but not in git-config(1), which was more likely place for people to look for when they ask "can I make a one-shot override, and if so how?" * dg/document-git-c-in-git-config-doc: doc: mention `git -c` in git-config(1) | 09 September 2016, 04:35:56 UTC |
| ba22efd | Junio C Hamano | 09 September 2016, 04:35:55 UTC | Merge branch 'js/no-html-bypass-on-windows' into maint On Windows, help.browser configuration variable used to be ignored, which has been corrected. * js/no-html-bypass-on-windows: Revert "display HTML in default browser using Windows' shell API" | 09 September 2016, 04:35:55 UTC |
| bde42f0 | Junio C Hamano | 09 September 2016, 04:35:54 UTC | Merge branch 'jk/difftool-command-not-found' into maint "git difftool" by default ignores the error exit from the backend commands it spawns, because often they signal that they found differences by exiting with a non-zero status code just like "diff" does; the exit status codes 126 and above however are special in that they are used to signal that the command is not executable, does not exist, or killed by a signal. "git difftool" has been taught to notice these exit status codes. * jk/difftool-command-not-found: difftool: always honor fatal error exit codes | 09 September 2016, 04:35:54 UTC |
| 7c96471 | Junio C Hamano | 09 September 2016, 04:35:54 UTC | Merge branch 'sb/checkout-explit-detach-no-advice' into maint "git checkout --detach <branch>" used to give the same advice message as that is issued when "git checkout <tag>" (or anything that is not a branch name) is given, but asking with "--detach" is an explicit enough sign that the user knows what is going on. The advice message has been squelched in this case. * sb/checkout-explit-detach-no-advice: checkout: do not mention detach advice for explicit --detach option | 09 September 2016, 04:35:54 UTC |
| 6930731 | Junio C Hamano | 09 September 2016, 04:35:54 UTC | Merge branch 'rs/pull-signed-tag' into maint When "git merge-recursive" works on history with many criss-cross merges in "verbose" mode, the names the command assigns to the virtual merge bases could have overwritten each other by unintended reuse of the same piece of memory. * rs/pull-signed-tag: commit: use FLEX_ARRAY in struct merge_remote_desc merge-recursive: fix verbose output for multiple base trees commit: factor out set_merge_remote_desc() commit: use xstrdup() in get_merge_parent() | 09 September 2016, 04:35:54 UTC |
| 86df11b | Junio C Hamano | 09 September 2016, 04:35:54 UTC | Merge branch 'js/test-lint-pathname' into maint The "t/" hierarchy is prone to get an unusual pathname; "make test" has been taught to make sure they do not contain paths that cannot be checked out on Windows (and the mechanism can be reusable to catch pathnames that are not portable to other platforms as need arises). * js/test-lint-pathname: t/Makefile: ensure that paths are valid on platforms we care | 09 September 2016, 04:35:54 UTC |
| 8e7c580 | Junio C Hamano | 09 September 2016, 04:35:54 UTC | Merge branch 'js/mv-dir-to-new-directory' into maint "git mv dir non-existing-dir/" did not work in some environments the same way as existing mainstream platforms. The code now moves "dir" to "non-existing-dir", without relying on rename("A", "B/") that strips the trailing slash of '/'. * js/mv-dir-to-new-directory: git mv: do not keep slash in `git mv dir non-existing-dir/` | 09 September 2016, 04:35:54 UTC |
| 5e09f1d | Junio C Hamano | 09 September 2016, 04:35:54 UTC | Merge branch 'js/import-tars-hardlinks' into maint "import-tars" fast-import script (in contrib/) used to ignore a hardlink target and replaced it with an empty file, which has been corrected to record the same blob as the other file the hardlink is shared with. * js/import-tars-hardlinks: import-tars: support hard links | 09 September 2016, 04:35:54 UTC |
