| 60115f5 | Junio C Hamano | 29 April 2016, 21:18:16 UTC | Git 2.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2016, 21:19:11 UTC |
| 0c1a8ec | Junio C Hamano | 29 April 2016, 21:16:01 UTC | Merge branch 'js/mingw-tests-2.8' into maint Code clean-up. * js/mingw-tests-2.8: Windows: shorten code by re-using convert_slashes() | 29 April 2016, 21:16:01 UTC |
| 4dda133 | Junio C Hamano | 29 April 2016, 21:16:00 UTC | Merge branch 'ep/trace-doc-sample-fix' into maint Fix a typo in an example in the trace API documentation. * ep/trace-doc-sample-fix: api-trace.txt: fix typo | 29 April 2016, 21:16:00 UTC |
| 98eef48 | Junio C Hamano | 29 April 2016, 21:15:59 UTC | Merge branch 'jc/makefile-redirection-stderr' into maint A minor fix in the Makefile. * jc/makefile-redirection-stderr: Makefile: fix misdirected redirections | 29 April 2016, 21:15:59 UTC |
| a470839 | Junio C Hamano | 29 April 2016, 21:15:58 UTC | Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maint Minor code cleanup. * ak/use-hashmap-iter-first-in-submodule-config: submodule-config: use hashmap_iter_first() | 29 April 2016, 21:15:58 UTC |
| 002dd77 | Junio C Hamano | 29 April 2016, 21:15:58 UTC | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint When running "git blame $path" with unnormalized data in the index for the path, the data in the working tree was blamed, even though "git add" would not have changed what is already in the index, due to "safe crlf" that disables the line-end conversion. It has been corrected. * tb/blame-force-read-cache-to-workaround-safe-crlf: correct blame for files commited with CRLF | 29 April 2016, 21:15:58 UTC |
| 18c554b | Junio C Hamano | 29 April 2016, 21:15:56 UTC | Merge branch 'sk/send-pack-all-fix' into maint "git send-pack --all <there>" was broken when its command line option parsing was written in the 2.6 timeframe. * sk/send-pack-all-fix: git-send-pack: fix --all option when used with directory | 29 April 2016, 21:15:57 UTC |
| b96c396 | Junio C Hamano | 29 April 2016, 21:15:55 UTC | Merge branch 'sg/diff-multiple-identical-renames' into maint "git diff -M" used to work better when two originally identical files A and B got renamed to X/A and X/B by pairing A to X/A and B to X/B, but this was broken in the 2.0 timeframe. * sg/diff-multiple-identical-renames: diffcore: fix iteration order of identical files during rename detection | 29 April 2016, 21:15:55 UTC |
| 3bb56a9 | Junio C Hamano | 29 April 2016, 21:15:54 UTC | Merge branch 'ss/msvc' into maint Build updates for MSVC. * ss/msvc: MSVC: use shipped headers instead of fallback definitions MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more | 29 April 2016, 21:15:54 UTC |
| 625efa9 | Junio C Hamano | 25 April 2016, 20:36:26 UTC | Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint l10n-2.8.0-rnd3-fr * tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po: l10n: fr: don't translate "merge" as a parameter l10n: fr: change "id de clé" to match "id-clé" l10n: fr: fix wrongly translated option name l10n: fr: fix transcation of "dir" | 25 April 2016, 20:36:26 UTC |
| 2ee0fca | Jiang Xin | 24 April 2016, 12:36:34 UTC | Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint * 'fr_v2.8.0_r3' of git://github.com/jnavila/git: l10n: fr: don't translate "merge" as a parameter l10n: fr: change "id de clé" to match "id-clé" l10n: fr: fix wrongly translated option name l10n: fr: fix transcation of "dir" | 24 April 2016, 12:36:34 UTC |
| 6a66362 | Junio C Hamano | 15 April 2016, 01:58:11 UTC | Prepare for 2.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2016, 01:58:11 UTC |
| a5953f6 | Junio C Hamano | 15 April 2016, 01:57:49 UTC | Merge branch 'jv/merge-nothing-into-void' into maint "git merge FETCH_HEAD" dereferenced NULL pointer when merging nothing into an unborn history (which is arguably unusual usage, which perhaps was the reason why nobody noticed it). * jv/merge-nothing-into-void: merge: fix NULL pointer dereference when merging nothing into void | 15 April 2016, 01:57:49 UTC |
| ea7fefb | Junio C Hamano | 15 April 2016, 01:57:48 UTC | Merge branch 'ss/commit-squash-msg' into maint When "git merge --squash" stopped due to conflict, the concluding "git commit" failed to read in the SQUASH_MSG that shows the log messages from all the squashed commits. * ss/commit-squash-msg: commit: do not lose SQUASH_MSG contents | 15 April 2016, 01:57:48 UTC |
| 8cad7fc | Junio C Hamano | 15 April 2016, 01:57:47 UTC | Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint "git send-email" had trouble parsing alias file in mailrc format when lines in it had trailing whitespaces on them. * jk/send-email-rtrim-mailrc-alias: send-email: ignore trailing whitespace in mailrc alias file | 15 April 2016, 01:57:47 UTC |
| 517736f | Junio C Hamano | 15 April 2016, 01:57:47 UTC | Merge branch 'da/mergetool-delete-delete-conflict' into maint "git mergetool" did not work well with conflicts that both sides deleted. * da/mergetool-delete-delete-conflict: mergetool: honor tempfile configuration when resolving delete conflicts mergetool: support delete/delete conflicts | 15 April 2016, 01:57:47 UTC |
| 237e6db | Junio C Hamano | 15 April 2016, 01:57:46 UTC | Merge branch 'jk/startup-info' into maint The startup_info data, which records if we are working inside a repository (among other things), are now uniformly available to Git subcommand implementations, and Git avoids attempting to touch references when we are not in a repository. * jk/startup-info: use setup_git_directory() in test-* programs grep: turn off gitlink detection for --no-index mailmap: do not resolve blobs in a non-repository remote: don't resolve HEAD in non-repository setup: set startup_info->have_repository more reliably setup: make startup_info available everywhere | 15 April 2016, 01:57:46 UTC |
| f55f97c | Junio C Hamano | 15 April 2016, 01:57:46 UTC | Merge branch 'jk/getwholeline-getdelim-empty' into maint strbuf_getwholeline() did not NUL-terminate the buffer on certain corner cases in its error codepath. * jk/getwholeline-getdelim-empty: strbuf_getwholeline: NUL-terminate getdelim buffer on error | 15 April 2016, 01:57:46 UTC |
| 183ecc3 | Junio C Hamano | 15 April 2016, 01:57:45 UTC | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint A small memory leak in an error codepath has been plugged in xdiff code. * rj/xdiff-prepare-plug-leak-on-error-codepath: xdiff/xprepare: fix a memory leak xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits | 15 April 2016, 01:57:46 UTC |
| dc66371 | Junio C Hamano | 15 April 2016, 01:57:44 UTC | Merge branch 'gf/fetch-pack-direct-object-fetch' into maint Fetching of history by naming a commit object name directly didn't work across remote-curl transport. * gf/fetch-pack-direct-object-fetch: fetch-pack: update the documentation for "<refs>..." arguments fetch-pack: fix object_id of exact sha1 | 15 April 2016, 01:57:44 UTC |
| 7488c2f | Junio C Hamano | 15 April 2016, 01:57:44 UTC | Merge branch 'jk/rev-parse-local-env-vars' into maint The "--local-env-vars" and "--resolve-git-dir" options of "git rev-parse" failed to work outside a repository when the command's option parsing was rewritten in 1.8.5 era. * jk/rev-parse-local-env-vars: rev-parse: let some options run outside repository t1515: add tests for rev-parse out-of-repo helpers | 15 April 2016, 01:57:44 UTC |
| 0759dfd | Junio C Hamano | 15 April 2016, 01:57:43 UTC | Merge branch 'jk/config-get-urlmatch' into maint "git config --get-urlmatch", unlike other variants of the "git config --get" family, did not signal error with its exit status when there was no matching configuration. * jk/config-get-urlmatch: Documentation/git-config: fix --get-all description Documentation/git-config: use bulleted list for exit codes config: fail if --get-urlmatch finds no value | 15 April 2016, 01:57:43 UTC |
| f1cfacf | Junio C Hamano | 15 April 2016, 01:37:18 UTC | Merge branch 'pb/t7502-drop-dup' into maint Code clean-up. * pb/t7502-drop-dup: t/t7502 : drop duplicate test | 15 April 2016, 01:37:18 UTC |
| b5d7308 | Junio C Hamano | 15 April 2016, 01:37:17 UTC | Merge branch 'jk/test-httpd-config-nosystem' into maint The tests that involve running httpd leaked the system-wide configuration in /etc/gitconfig to the tested environment. * jk/test-httpd-config-nosystem: t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env | 15 April 2016, 01:37:17 UTC |
| 5859f04 | Junio C Hamano | 15 April 2016, 01:37:16 UTC | Merge branch 'sb/clone-t57-t56' into maint Rename bunch of tests on "git clone" for better organization. * sb/clone-t57-t56: clone tests: rename t57* => t56* | 15 April 2016, 01:37:17 UTC |
| 485c7ad | Junio C Hamano | 15 April 2016, 01:37:16 UTC | Merge branch 'jk/credential-cache-comment-exit' into maint A code clarification. * jk/credential-cache-comment-exit: credential-cache--daemon: clarify "exit" action semantics | 15 April 2016, 01:37:16 UTC |
| 1d1cbe2 | Junio C Hamano | 15 April 2016, 01:37:15 UTC | Merge branch 'jc/index-pack' into maint Code clean-up. * jc/index-pack: index-pack: add a helper function to derive .idx/.keep filename index-pack: correct --keep[=<msg>] | 15 April 2016, 01:37:16 UTC |
| 9fabc70 | Junio C Hamano | 15 April 2016, 01:37:15 UTC | Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint Code clean-up. * ss/exc-flag-is-a-collection-of-bits: dir: store EXC_FLAG_* values in unsigned integers | 15 April 2016, 01:37:15 UTC |
| e073544 | Junio C Hamano | 15 April 2016, 01:37:14 UTC | Merge branch 'mp/upload-pack-use-embedded-args' into maint The embedded args argv-array in the child process is used to build the command line to run pack-objects instead of using a separate array of strings. * mp/upload-pack-use-embedded-args: upload-pack: use argv_array for pack_objects | 15 April 2016, 01:37:14 UTC |
| 2bbaad8 | Junio C Hamano | 15 April 2016, 01:37:14 UTC | Merge branch 'oa/doc-diff-check' into maint A minor documentation update. * oa/doc-diff-check: Documentation: git diff --check detects conflict markers | 15 April 2016, 01:37:14 UTC |
| 48adfa1 | Junio C Hamano | 15 April 2016, 01:37:13 UTC | Merge branch 'pb/opt-cmdmode-doc' into maint Minor API documentation update. * pb/opt-cmdmode-doc: api-parse-options.txt: document OPT_CMDMODE() | 15 April 2016, 01:37:13 UTC |
| f0acaa6 | Junio C Hamano | 15 April 2016, 01:37:13 UTC | Merge branch 'nd/apply-doc' into maint A minor documentation update. * nd/apply-doc: git-apply.txt: mention the behavior inside a subdir git-apply.txt: remove a space | 15 April 2016, 01:37:13 UTC |
| e919f55 | Junio C Hamano | 15 April 2016, 01:37:12 UTC | Merge branch 'cc/doc-recommend-performance-trace-to-file' into maint A minor documentation update. * cc/doc-recommend-performance-trace-to-file: Documentation: talk about pager in api-trace.txt | 15 April 2016, 01:37:12 UTC |
| bb0b4a9 | Junio C Hamano | 15 April 2016, 01:37:12 UTC | Merge branch 'mm/lockfile-error-message' into maint * mm/lockfile-error-message: lockfile: improve error message when lockfile exists lockfile: mark strings for translation | 15 April 2016, 01:37:12 UTC |
| 167259b | Junio C Hamano | 13 April 2016, 23:30:00 UTC | Start preparing for 2.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2016, 23:30:00 UTC |
| a08feb8 | Torsten Bögershausen | 05 April 2016, 19:23:54 UTC | correct blame for files commited with CRLF git blame reports lines as not "Not Committed Yet" when they have CRLF in the index, CRLF in the worktree and core.autocrlf is true. Since commit c4805393 (autocrlf: Make it work also for un-normalized repositories, 2010-05-12), files that have CRLF in the index are not normalized at commit when core.autocrl is set. Add a call to read_cache() early in fake_working_tree_commit(), before calling convert_to_git(). Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2016, 20:55:30 UTC |
| 4232b21 | Elia Pinto | 05 April 2016, 10:05:23 UTC | api-trace.txt: fix typo The correct api is trace_printf_key(), not trace_print_key(). Also do not throw a random string at printf(3)-like function; instead, feed it as a parameter that is fed to a "%s" conversion specifier. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2016, 20:51:25 UTC |
| d55de70 | Junio C Hamano | 05 April 2016, 07:02:14 UTC | Makefile: fix misdirected redirections In general "echo 2>&1 $msg" to redirect a possible error message that comes from 'echo' itself into the same standard output stream $msg is getting written to does not make any sense; it is not like we are expecting to see any errors out of 'echo' in these statements, and even if it were the case, there is no reason to prevent the error messages from being sent to the standard error stream. These are clearly meant to send the argument given to echo to the standard error stream as error messages. Correctly redirect by saying "send what is written to the standard output to the standard error", i.e. "1>&2" aka ">&2". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2016, 07:03:05 UTC |
| 8e9b208 | Johannes Sixt | 02 April 2016, 19:03:14 UTC | Windows: shorten code by re-using convert_slashes() Make a few more spots more readable by using the recently introduced, Windows-specific helper. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2016, 01:03:02 UTC |
| d95553a | Junio C Hamano | 03 April 2016, 17:11:35 UTC | Git 2.8.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2016, 17:14:12 UTC |
| 6e4de7f | Junio C Hamano | 03 April 2016, 17:13:09 UTC | Merge branch 'mm/readme-markdown' into maint * 'mm/readme-markdown': git.spec.in: use README.md, not README | 03 April 2016, 17:13:09 UTC |
| c7089e0 | Matthieu Moy | 01 April 2016, 07:10:51 UTC | git.spec.in: use README.md, not README The file was renamed in 4ad21f5 (README: use markdown syntax, 2016-02-25), but that commit forgot to update git.spec.in, which caused the rpmbuild target in the Makefile to fail. Reported-by: Ron Isaacson <isaacson.ljits@gmail.com> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2016, 17:12:48 UTC |
| c677756 | Stanislav Kolotinskiy | 31 March 2016, 13:55:09 UTC | git-send-pack: fix --all option when used with directory When using git send-pack with --all option and a target repository specification ([<host>:]<directory>), usage message is being displayed instead of performing the actual transmission. The reason for this issue is that destination and refspecs are being set in the same conditional and are populated from argv. When a target repository is passed, refspecs is being populated as well with its value. This makes the check for refspecs not being NULL to always return true, which, in conjunction with the check for --all or --mirror options, is always true as well and returns usage message instead of proceeding. This ensures that send-pack will stop execution only when --all or --mirror switch is used in conjunction with any refspecs passed. Signed-off-by: Stanislav Kolotinskiy <stanislav@assembla.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2016, 21:58:26 UTC |
| ca4e3ca | SZEDER Gábor | 30 March 2016, 08:35:07 UTC | diffcore: fix iteration order of identical files during rename detection If the two paths 'dir/A/file' and 'dir/B/file' have identical content and the parent directory is renamed, e.g. 'git mv dir other-dir', then diffcore reports the following exact renames: renamed: dir/B/file -> other-dir/A/file renamed: dir/A/file -> other-dir/B/file While technically not wrong, this is confusing not only for the user, but also for git commands that make decisions based on rename information, e.g. 'git log --follow other-dir/A/file' follows 'dir/B/file' past the rename. This behavior is a side effect of commit v2.0.0-rc4~8^2~14 (diffcore-rename.c: simplify finding exact renames, 2013-11-14): the hashmap storing sources returns entries from the same bucket, i.e. sources matching the current destination, in LIFO order. Thus the iteration first examines 'other-dir/A/file' and 'dir/B/file' and, upon finding identical content and basename, reports an exact rename. Other hashmap users are apparently happy with the current iteration order over the entries of a bucket. Changing the iteration order would risk upsetting other hashmap users and would increase the memory footprint of each bucket by a pointer to the tail element. Fill the hashmap with source entries in reverse order to restore the original exact rename detection behavior. Reported-by: Bill Okara <billokara@gmail.com> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2016, 20:46:04 UTC |
| 0ef60af | Sven Strickroth | 30 March 2016, 11:37:36 UTC | MSVC: use shipped headers instead of fallback definitions VS2010 comes with stdint.h [1] VS2013 comes with inttypes.h [2] [1] https://stackoverflow.com/a/2628014/3906760 [2] https://blogs.msdn.microsoft.com/vcblog/2013/07/19/c99-library-support-in-visual-studio-2013/ Signed-off-by: Sven Strickroth <sven@cs-ware.de> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Acked-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2016, 18:16:20 UTC |
| dae26d3 | Sven Strickroth | 29 March 2016, 16:25:28 UTC | MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more In MSVC2015 the behavior of vsnprintf was changed. W/o this fix there is one character missing at the end. Signed-off-by: Sven Strickroth <sven@cs-ware.de> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Acked-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2016, 18:13:01 UTC |
| 30211fb | Ori Avtalion | 29 March 2016, 18:59:45 UTC | Documentation: git diff --check detects conflict markers Signed-off-by: Ori Avtalion <ori@avtalion.name> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2016, 20:14:50 UTC |
| 90f7b16 | Junio C Hamano | 28 March 2016, 19:19:45 UTC | Git 2.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2016, 19:19:45 UTC |
| c3f6b85 | Pranit Bauva | 25 March 2016, 18:58:58 UTC | api-parse-options.txt: document OPT_CMDMODE() OPT_CMDMODE mechanism was introduced in the release of 1.8.5 to actively notice when multiple "operation mode" options that specify mutually incompatible operation modes are given. Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2016, 20:17:43 UTC |
| 47caafd | Jean-Noël Avila | 25 March 2016, 16:11:20 UTC | Merge pull request #9 from vascool/fr Fix inconsistencies | 25 March 2016, 16:11:20 UTC |
| bb31072 | Vasco Almeida | 15 March 2016, 00:34:22 UTC | l10n: fr: don't translate "merge" as a parameter At builtin/checkout.c:1154, merge is a parameter to --conflict=<style> (git checkout --conflict=merge). Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> | 25 March 2016, 15:04:58 UTC |
| abf5795 | Vasco Almeida | 15 March 2016, 00:34:22 UTC | l10n: fr: change "id de clé" to match "id-clé" At builtin/tag.c:23 French message translation, "<key-id>" was translated to "<id-clé>", but at builtin/tag.c:355 "key-id" was translated to "id de clé", hence an inconsistency in git tag -h output. Translate "key-id" to "id-clé". Alternatively, both places could use "id de clé" instead of "id-clé". Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> | 25 March 2016, 15:04:58 UTC |
| a0f3d92 | Vasco Almeida | 13 March 2016, 12:56:03 UTC | l10n: fr: fix wrongly translated option name In the original source, tags and heads refer to that options (--head and --tags) for git show-ref. Don't translate that terms, since they refer to actual option names. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> | 25 March 2016, 15:04:58 UTC |
| 794b1d2 | Vasco Almeida | 13 March 2016, 12:56:03 UTC | l10n: fr: fix transcation of "dir" "dir" was translated to the same string at builtin/log.c:1236, but, also at that code line, "<dir>" was translate to "<répertoire>". Before this commit, git format-patch -h would output "-o, --output-directory <dir>" and <répertoire> in its description. Use <répertoire> in both the parameter and description. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> | 25 March 2016, 15:04:58 UTC |
| 56331f8 | Junio C Hamano | 24 March 2016, 19:28:06 UTC | Merge branch 'ls/p4-doc-markup' * ls/p4-doc-markup: Documentation: fix git-p4 AsciiDoc formatting Documentation: use ASCII quotation marks in git-p4 | 24 March 2016, 19:28:06 UTC |
| 269fe3a | Junio C Hamano | 24 March 2016, 19:27:58 UTC | Merge branch 'js/mingw-tests-2.8' * js/mingw-tests-2.8: mingw: skip some tests in t9115 due to file name issues t1300: fix the new --show-origin tests on Windows t1300-repo-config: make it resilient to being run via 'sh -x' config --show-origin: report paths with forward slashes | 24 March 2016, 19:27:58 UTC |
| 2a4c8c3 | Junio C Hamano | 24 March 2016, 19:27:12 UTC | Merge branch 'sb/submodule-module-list-pathspec-fix' A fix for a small regression in "module_list" helper that was rewritten in C (also applies to 2.7.x). * sb/submodule-module-list-pathspec-fix: submodule: fix regression for deinit without submodules | 24 March 2016, 19:27:13 UTC |
| 16a86d4 | Nguyễn Thái Ngọc Duy | 24 March 2016, 11:56:17 UTC | git-apply.txt: mention the behavior inside a subdir Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2016, 17:16:52 UTC |
| d725fbd | Nguyễn Thái Ngọc Duy | 24 March 2016, 11:56:16 UTC | git-apply.txt: remove a space Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2016, 17:16:50 UTC |
| 01d98e8 | Alexander Kuleshov | 16 March 2016, 07:46:31 UTC | submodule-config: use hashmap_iter_first() The hashmap API provides hashmap_iter_first() helper for initialion and getting the first entry of a hashmap. Let's use it instead of doing initialization manually and then get the first entry. There are no functional changes, just cleanup. Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2016, 20:39:13 UTC |
| 7e4ba36 | Junio C Hamano | 23 March 2016, 19:22:42 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: pt_PT: Update and add new translations l10n: ca.po: update translation l10n: vi.po (2530t): Update translation | 23 March 2016, 19:22:42 UTC |
| b84e65d | Junio C Hamano | 21 March 2016, 19:01:43 UTC | merge: fix NULL pointer dereference when merging nothing into void When we are on an unborn branch and merging only one foreign parent, we allow "git merge" to fast-forward to that foreign parent commit. This codepath incorrectly attempted to dereference the list of parents that the merge is going to record even when the list is empty. It must refuse to operate instead when there is no parent. All other codepaths make sure the list is not empty before they dereference it, and are safe. Reported-by: Jose Ivan B. Vilarouca Filho Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2016, 17:12:10 UTC |
| 887523e | Lars Schneider | 23 March 2016, 10:59:01 UTC | Documentation: fix git-p4 AsciiDoc formatting Noticed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2016, 17:09:11 UTC |
| 8257d3b | Johannes Schindelin | 23 March 2016, 10:55:20 UTC | mingw: skip some tests in t9115 due to file name issues These two tests wanted to write file names which are incompatible with Windows' file naming rules (even if they pass using Cygwin due to Cygwin's magic path mangling). While at it, skip the same tests also on MacOSX/HFS, as pointed out by Torsten Bögershausen. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Torsten Bögershausen <tboegi@web.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2016, 17:03:37 UTC |
| 45bf329 | Johannes Schindelin | 23 March 2016, 10:55:13 UTC | t1300: fix the new --show-origin tests on Windows On Windows, we have that funny situation where the test script can refer to POSIX paths because it runs in a shell that uses a POSIX emulation layer ("MSYS2 runtime"). Yet, git.exe does *not* understand POSIX paths at all but only pure Windows paths. So let's just convert the POSIX paths to Windows paths before passing them on to Git, using `pwd` (which is already modified on Windows to output Windows paths). While fixing the new tests on Windows, we also have to exclude the tests that want to write a file with a name that is illegal on Windows (unfortunately, there is more than one test trying to make use of that file). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2016, 17:02:46 UTC |
| 2ec2021 | Johannes Schindelin | 23 March 2016, 10:55:07 UTC | t1300-repo-config: make it resilient to being run via 'sh -x' One way to diagnose broken regression tests is to run the test script using 'sh -x t... -i -v' to find out which call actually demonstrates the symptom. Hence it is pretty counterproductive if the test script behaves differently when being run via 'sh -x', in particular when using test_cmp or test_i18ncmp on redirected stderr. A more recent way "sh tXXXX -i -v -x" has the same issue. So let's use test_i18ngrep (as suggested by Jonathan Nieder) instead of test_cmp/test_i18ncmp to verify that stderr looks as expected. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2016, 16:59:21 UTC |
| 5ca6b7b | Johannes Schindelin | 23 March 2016, 10:55:00 UTC | config --show-origin: report paths with forward slashes On Windows, the backslash is the native directory separator, but all supported Windows versions also accept the forward slash in most circumstances. Our tests expect forward slashes. Relative paths are generated by Git using forward slashes. So let's try to be consistent and use forward slashes in the $HOME part of the paths reported by `git config --show-origin`, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2016, 16:58:48 UTC |
| 103ee5c | Jiang Xin | 23 March 2016, 15:01:51 UTC | Merge branch 'master' of https://github.com/vnwildman/git * 'master' of https://github.com/vnwildman/git: l10n: vi.po (2530t): Update translation | 23 March 2016, 15:01:51 UTC |
| 7074956 | Jiang Xin | 23 March 2016, 14:48:14 UTC | Merge branch 'master' of git://github.com/alexhenrie/git-po * 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation | 23 March 2016, 14:48:14 UTC |
| 84ba959 | Stefan Beller | 22 March 2016, 23:42:14 UTC | submodule: fix regression for deinit without submodules Per Cederqvist wrote: > It used to be possible to run > > git submodule deinit -f . > > to remove any submodules, no matter how many submodules you had. That > is no longer possible in projects that don't have any submodules at > all. The command will fail with: > > error: pathspec '.' did not match any file(s) known to git. This regression was introduced in 74703a1e4dfc (submodule: rewrite `module_list` shell function in C, 2015-09-02), as we changed the order of checking in new module listing to first check whether it is a gitlin before feeding it to match_pathspec(). It used to be that a pathspec that does not match any path were diagnosed as an error, but the new code complains for a pathspec that does not match any submodule path. Arguably the new behaviour may give us a better diagnosis, but that is inconsistent with the suggestion "deinit" gives, and also this was an unintended accident. The new behaviour hopefully can be redesigned and implemented better in future releases, but for now, switch these two checks to restore the same behavior as before. In an empty repository, giving the pathspec '.' will still get the same "did not match" error, but that is the same bug we had before 1.7.0. Reported-by: Per Cederqvist <cederp@opera.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2016, 02:26:43 UTC |
| b3076a0 | Vasco Almeida | 29 January 2016, 20:06:29 UTC | l10n: pt_PT: Update and add new translations Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> | 22 March 2016, 17:23:56 UTC |
| 4ee278b | Alex Henrie | 22 March 2016, 05:04:22 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 22 March 2016, 05:04:22 UTC |
| b64c1e0 | Sven Strickroth | 21 March 2016, 22:29:40 UTC | commit: do not lose SQUASH_MSG contents When concluding a conflicted "git merge --squash", the command failed to read SQUASH_MSG that was prepared by "git merge", and showed only the "# Conflicts:" list of conflicted paths. Place the contents from SQUASH_MSG at the beginning, just like we show the commit log skeleton first when concluding a normal merge, and then show the "# Conflicts:" list, to help the user write the log message for the resulting commit. Test by Junio C Hamano <gitster@pobox.com>. Signed-off-by: Sven Strickroth <sven@cs-ware.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2016, 22:32:24 UTC |
| 808ecd4 | Junio C Hamano | 21 March 2016, 20:41:37 UTC | Git 2.8-rc4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2016, 20:41:37 UTC |
| fb238fb | Junio C Hamano | 21 March 2016, 20:32:42 UTC | Sync with maint * maint: Documentation: fix broken linkgit to git-config git-compat-util: st_add4: work around gcc 4.2.x compiler crash | 21 March 2016, 20:32:42 UTC |
| a0feb1b | Junio C Hamano | 21 March 2016, 20:32:18 UTC | Merge branch 'mm/doc-hooks-linkgit-fix' into maint * mm/doc-hooks-linkgit-fix: Documentation: fix broken linkgit to git-config | 21 March 2016, 20:32:18 UTC |
| ad52148 | Matthieu Moy | 21 March 2016, 18:38:34 UTC | Documentation: fix broken linkgit to git-config Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2016, 20:31:57 UTC |
| c6a896b | Lars Schneider | 20 March 2016, 18:39:21 UTC | Documentation: use ASCII quotation marks in git-p4 Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2016, 18:14:24 UTC |
| 0746773 | Junio C Hamano | 21 March 2016, 16:20:13 UTC | Merge branch 'tb/avoid-gcc-on-darwin-10-6' * tb/avoid-gcc-on-darwin-10-6: Revert "config.mak.uname: use clang for Mac OS X 10.6" | 21 March 2016, 16:20:13 UTC |
| c0ed759 | Eric Sunshine | 21 March 2016, 04:35:58 UTC | Revert "config.mak.uname: use clang for Mac OS X 10.6" This reverts commit 7b6daf8d2fee1a9866b1d4eddbfaa5dbc42c5dbb. Now that st_add4() has been patched to work around the gcc 4.2.x compiler crash, revert the sledge-hammer approach of forcing Mac OS X 10.6 to unconditionally use 'clang' rather than the default compiler (gcc). Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2016, 16:20:02 UTC |
| 2ab5c88 | Junio C Hamano | 21 March 2016, 16:19:27 UTC | Merge branch 'es/st-add4-gcc-4.2-workaround' into maint * es/st-add4-gcc-4.2-workaround: git-compat-util: st_add4: work around gcc 4.2.x compiler crash | 21 March 2016, 16:19:27 UTC |
| d616fbf | Eric Sunshine | 21 March 2016, 04:35:57 UTC | git-compat-util: st_add4: work around gcc 4.2.x compiler crash Although changes by 5b442c4 (tree-diff: catch integer overflow in combine_diff_path allocation, 2016-02-19) are perfectly valid, they unfortunately trigger an internal compiler error in gcc 4.2.x: combine-diff.c: In function 'diff_tree_combined': combine-diff.c:1391: internal compiler error: Segmentation fault: 11 Experimentation reveals that changing st_add4()'s argument evaluation order is sufficient to sidestep this problem. Although st_add3() does not trigger the compiler bug, for style consistency, change its argument evaluation order to match. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2016, 16:18:07 UTC |
| b552ff8 | Junio C Hamano | 21 March 2016, 01:06:05 UTC | Merge tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-po l10n-2.8.0-rnd3 * tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-po: l10n: zh_CN: review for git v2.8.0 l10n round 2 l10n: de.po: add missing newlines l10n: de.po: translate 22 new messages l10n: ko.po: Update Korean translation l10n: fr.po v2.8.0 round 3 l10n: sv.po: Update Swedish translation (2530t0f0u) l10n: ru.po: update Russian translation | 21 March 2016, 01:06:05 UTC |
| 257000c | Junio C Hamano | 21 March 2016, 01:05:10 UTC | Merge branch 'master' of git://ozlabs.org/~paulus/gitk * 'master' of git://ozlabs.org/~paulus/gitk: gitk: Follow themed bgcolor in help dialogs gitk: fr.po: Sync translations with git gitk: Update French translation (311t) gitk: Update German translation gitk: Update Bulgarian translation (311t) | 21 March 2016, 01:05:10 UTC |
| c2d6740 | Tran Ngoc Quan | 21 March 2016, 00:21:04 UTC | l10n: vi.po (2530t): Update translation Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 21 March 2016, 00:21:04 UTC |
| 26e4cbe | Ray Chen | 16 March 2016, 03:44:44 UTC | l10n: zh_CN: review for git v2.8.0 l10n round 2 Signed-off-by: Ray Chen <oldsharp@gmail.com> | 20 March 2016, 10:46:02 UTC |
| 22a713c | Guillermo S. Romero | 04 February 2016, 02:32:19 UTC | gitk: Follow themed bgcolor in help dialogs Make Help > About & Key bindings dialogs readable if theme has changed font color to something incompatible with white. Signed-off-by: Guillermo S. Romero <gsromero@infernal-iceberg.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 19 March 2016, 03:12:21 UTC |
| ffbd0d7 | Jean-Noel Avila | 29 January 2016, 20:21:35 UTC | gitk: fr.po: Sync translations with git Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Paul Mackerras <paulus@samba.org> | 19 March 2016, 03:08:52 UTC |
| 3782d70 | Jean-Noel Avila | 29 January 2016, 20:21:34 UTC | gitk: Update French translation (311t) Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Paul Mackerras <paulus@samba.org> | 19 March 2016, 03:08:52 UTC |
| fec7b51 | Ralf Thielow | 12 February 2016, 18:40:39 UTC | gitk: Update German translation Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 19 March 2016, 03:07:34 UTC |
| 37afa40 | Alexander Shopov | 19 December 2015, 22:36:09 UTC | gitk: Update Bulgarian translation (311t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 19 March 2016, 03:06:37 UTC |
| 1fad503 | Jeff King | 16 March 2016, 00:56:52 UTC | t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env We set GIT_CONFIG_NOSYSTEM in our test scripts so that we do not accidentally read /etc/gitconfig and have it influence the outcome of the tests. But when running smart-http tests, Apache will clean the environment, including this variable, and the "server" side of our http operations will read it. You can see this breakage by doing something like: make ./git config --system http.getanyfile false make test which will cause t5561 to fail when it tests the fallback-to-dumb operation. We can fix this by instructing Apache to pass through the variable. Unlike with other variables (e.g., 89c57ab3's GIT_TRACE), we don't need to set a dummy value to prevent warnings from Apache. test-lib.sh already makes sure that GIT_CONFIG_NOSYSTEM is set and exported. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2016, 22:37:58 UTC |
| 7d5e9c9 | Jeff King | 18 March 2016, 06:12:01 UTC | credential-cache--daemon: clarify "exit" action semantics When this code was originally written, there wasn't much thought given to the timing between a client asking for "exit", the daemon signaling that the action is done (with EOF), and the actual cleanup of the socket. However, we need to care about this so that our test scripts do not end up racy (e.g., by asking for an exit and checking that the socket was cleaned up). The code that is already there happens to behave very reasonably; let's add a comment to make it clear that any changes should retain the same behavior. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2016, 21:48:36 UTC |
| a277d1e | Jeff King | 17 March 2016, 23:58:22 UTC | send-email: ignore trailing whitespace in mailrc alias file The regex for parsing mailrc considers everything after the second whitespace to be the email address, up to the end of the line. We have to include whitespace there, because you may have multiple space-separated addresses, each with their own internal quoting. But if there is trailing whitespace, we include that, too. This confuses quotewords() when we try to split the individual addresses, and we end up storing "undef" in our alias list. Later parts of the code then access that, generating perl warnings. Let's tweak our regex to throw away any trailing whitespace on each line. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2016, 21:47:10 UTC |
| 047057b | Junio C Hamano | 18 March 2016, 18:10:53 UTC | RelNotes: remove the mention of !reinclusion We will be postponing this to a later cycle. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2016, 18:10:53 UTC |
| 5cee349 | Junio C Hamano | 18 March 2016, 18:06:15 UTC | Revert "Merge branch 'nd/exclusion-regression-fix'" This reverts commit 5e57f9c3dfe7dd44a1b56bb5b3327d7a1356ec7c, reversing changes made to e79112d21024beb997951381db21a70b087d459d. We will be postponing nd/exclusion-regression-fix topic to later cycle. | 18 March 2016, 18:06:15 UTC |
| 8ad3cb0 | Junio C Hamano | 18 March 2016, 18:05:23 UTC | Revert "Merge branch 'jc/exclusion-doc'" This reverts commit e80aae51f2be908e37fca47ea0dff6d7861c8497, reversing changes made to 68846a92eafa6b2bfae778d0a656443a9fa61e59. We will be postponing nd/exclusion-regression-fix topic to later cycle. | 18 March 2016, 18:05:23 UTC |
| 44915db | Junio C Hamano | 17 March 2016, 19:54:17 UTC | Sync with Git 2.7.4 * maint: Git 2.7.4 Git 2.6.6 Git 2.5.5 Git 2.4.11 | 17 March 2016, 19:54:17 UTC |
| 937978e | Junio C Hamano | 17 March 2016, 18:32:13 UTC | Git 2.7.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2016, 18:32:13 UTC |
| 29a382d | Ralf Thielow | 17 March 2016, 18:31:33 UTC | l10n: de.po: add missing newlines Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 17 March 2016, 18:31:33 UTC |
