| 92c2852 | Dimitriy Ryazantcev | 11 June 2016, 09:53:43 UTC | l10n: ru.po: update Russian translation Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> | 11 June 2016, 09:53:43 UTC |
| aef18cc | Ray Chen | 05 June 2016, 16:06:17 UTC | l10n: zh_CN: review for git v2.9.0 l10n round 1 Signed-off-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 09 June 2016, 14:08:39 UTC |
| 5b04ee3 | Jiang Xin | 29 May 2016, 12:40:35 UTC | l10n: zh_CN: for git v2.9.0 l10n round 1 Update 104 new translations (2596t1f0u) for git v2.9.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 06 June 2016, 14:33:59 UTC |
| f086c25 | Vasco Almeida | 27 May 2016, 19:17:32 UTC | l10n: pt_PT: update Portuguese translation Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> | 31 May 2016, 18:17:40 UTC |
| ef04f0d | Vasco Almeida | 27 May 2016, 15:09:29 UTC | l10n: pt_PT: update according to git-gui glossary Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> | 31 May 2016, 18:16:03 UTC |
| ca1a787 | Vasco Almeida | 28 May 2016, 17:14:12 UTC | l10n: pt_PT: merge git.pot file Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> | 31 May 2016, 18:15:56 UTC |
| 0d670e7 | Alexander Shopov | 06 March 2016, 15:19:16 UTC | l10n: Updated Bulgarian translation of git (2597t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 29 May 2016, 13:13:24 UTC |
| 6dfee07 | Jiang Xin | 29 May 2016, 11:55:26 UTC | Merge branch 'v2.9.0_rnd1_fr' of git://github.com/jnavila/git * 'v2.9.0_rnd1_fr' of git://github.com/jnavila/git: l10n: fr.po v2.9.0rnd1 | 29 May 2016, 11:55:26 UTC |
| 5ed5b8d | Peter Krefting | 27 May 2016, 13:04:42 UTC | l10n: sv.po: Update Swedish translation (2597t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 27 May 2016, 13:04:42 UTC |
| 955efd6 | Jean-Noel Avila | 26 May 2016, 20:46:41 UTC | l10n: fr.po v2.9.0rnd1 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 26 May 2016, 20:46:41 UTC |
| e890b29 | Jiang Xin | 26 May 2016, 15:40:48 UTC | Merge branch 'fix_fr' of git://github.com/jnavila/git * 'fix_fr' of git://github.com/jnavila/git: l10n: fr.po Fixed grammar mistake | 26 May 2016, 15:40:48 UTC |
| 72e3c7a | Tran Ngoc Quan | 25 May 2016, 00:42:13 UTC | l10n: Updated Vietnamese translation (2597t) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 25 May 2016, 00:42:13 UTC |
| f517e50 | Jiang Xin | 24 May 2016, 15:43:14 UTC | l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed) Generate po/git.pot from v2.9.0-rc0 for git v2.9.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 24 May 2016, 15:43:14 UTC |
| 3a0f269 | Junio C Hamano | 23 May 2016, 22:02:48 UTC | Git 2.9-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2016, 22:02:48 UTC |
| f4d7b2e | Junio C Hamano | 23 May 2016, 22:01:03 UTC | Merge branch 'svn-travis' of git://bogomips.org/git-svn * 'svn-travis' of git://bogomips.org/git-svn: travis-ci: enable Git SVN tests t91xx on Linux | 23 May 2016, 22:01:03 UTC |
| ec34a8b | Junio C Hamano | 23 May 2016, 21:54:37 UTC | Merge branch 'jc/rerere-multi' * jc/rerere-multi: rerere: remove an null statement rerere: plug memory leaks upon "rerere forget" failure | 23 May 2016, 21:54:38 UTC |
| f895dd7 | Junio C Hamano | 23 May 2016, 21:54:36 UTC | Merge branch 'da/difftool' "git difftool" learned to handle unmerged paths correctly in dir-diff mode. * da/difftool: difftool: handle unmerged files in dir-diff mode difftool: initialize variables for readability | 23 May 2016, 21:54:36 UTC |
| dca05bb | Junio C Hamano | 23 May 2016, 21:54:35 UTC | Merge branch 'jk/test-z-n-unquoted' t9xxx series has been updated primarily for readability, while fixing small bugs in it. A few scripted Porcelains have also been updated to fix possible bugs around their use of "test -z" and "test -n". * jk/test-z-n-unquoted: always quote shell arguments to test -z/-n t9103: modernize test style t9107: switch inverted single/double quotes in test t9107: use "return 1" instead of "exit 1" t9100,t3419: enclose all test code in single-quotes t/lib-git-svn: drop $remote_git_svn and $git_svn_id | 23 May 2016, 21:54:35 UTC |
| 53c4b3e | Junio C Hamano | 23 May 2016, 21:54:35 UTC | Merge branch 'ar/diff-args-osx-precompose' Many commands normalize command line arguments from NFD to NFC variant of UTF-8 on OSX, but commands in the "diff" family did not, causing "git diff $path" to complain that no such path is known to Git. They have been taught to do the normalization. * ar/diff-args-osx-precompose: diff: run arguments through precompose_argv | 23 May 2016, 21:54:35 UTC |
| fa4f29b | Junio C Hamano | 23 May 2016, 21:54:34 UTC | Merge branch 'jc/doc-lint' Find common mistakes when writing gitlink: in our documentation and drive the check from "make check-docs". I am not entirely happy with the way the script chooses what input file to validate, but it is not worse than not having anything, so let's move it forward and have the logic improved later when people care about it deeply. * jc/doc-lint: ci: validate "linkgit:" in documentation | 23 May 2016, 21:54:34 UTC |
| 7b02771 | Junio C Hamano | 23 May 2016, 21:54:33 UTC | Merge branch 'js/perf-rebase-i' Add perf test for "rebase -i" * js/perf-rebase-i: perf: run "rebase -i" under perf perf: make the tests work in worktrees perf: let's disable symlinks when they are not available | 23 May 2016, 21:54:33 UTC |
| 2997ea9 | Junio C Hamano | 23 May 2016, 21:54:32 UTC | Merge branch 'jc/test-parse-options-expect' t0040 had too many unnecessary repetitions in its test data. Teach test-parse-options program so that a caller can tell what it expects in its output, so that these repetitions can be cleaned up. * jc/test-parse-options-expect: t0040: convert a few tests to use test-parse-options --expect t0040: remove unused test helpers test-parse-options: --expect=<string> option to simplify tests test-parse-options: fix output when callback option fails | 23 May 2016, 21:54:32 UTC |
| 5d5f1c2 | Junio C Hamano | 23 May 2016, 21:54:31 UTC | Merge branch 'pb/commit-verbose-config' "git commit" learned to pay attention to "commit.verbose" configuration variable and act as if "--verbose" option was given from the command line. * pb/commit-verbose-config: commit: add a commit.verbose config variable t7507-commit-verbose: improve test coverage by testing number of diffs parse-options.c: make OPTION_COUNTUP respect "unspecified" values t/t7507: improve test coverage t0040-parse-options: improve test coverage test-parse-options: print quiet as integer t0040-test-parse-options.sh: fix style issues | 23 May 2016, 21:54:32 UTC |
| 72ce3ff | Junio C Hamano | 23 May 2016, 21:54:31 UTC | Merge branch 'xy/format-patch-base' "git format-patch" learned a new "--base" option to record what (public, well-known) commit the original series was built on in its output. * xy/format-patch-base: format-patch: introduce format.useAutoBase configuration format-patch: introduce --base=auto option format-patch: add '--base' option to record base tree info patch-ids: make commit_patch_id() a public helper function | 23 May 2016, 21:54:31 UTC |
| 8e34225 | Junio C Hamano | 23 May 2016, 21:54:30 UTC | Merge branch 'tb/core-eol-fix' A couple of bugs around core.autocrlf have been fixed. * tb/core-eol-fix: convert.c: ident + core.autocrlf didn't work t0027: test cases for combined attributes convert: allow core.autocrlf=input and core.eol=crlf t0027: make commit_chk_wrnNNO() reliable | 23 May 2016, 21:54:30 UTC |
| 352d72a | Junio C Hamano | 23 May 2016, 21:54:29 UTC | Merge branch 'nd/worktree-various-heads' The experimental "multiple worktree" feature gains more safety to forbid operations on a branch that is checked out or being actively worked on elsewhere, by noticing that e.g. it is being rebased. * nd/worktree-various-heads: branch: do not rename a branch under bisect or rebase worktree.c: check whether branch is bisected in another worktree wt-status.c: split bisect detection out of wt_status_get_state() worktree.c: check whether branch is rebased in another worktree worktree.c: avoid referencing to worktrees[i] multiple times wt-status.c: make wt_status_check_rebase() work on any worktree wt-status.c: split rebase detection out of wt_status_get_state() path.c: refactor and add worktree_git_path() worktree.c: mark current worktree worktree.c: make find_shared_symref() return struct worktree * worktree.c: store "id" instead of "git_dir" path.c: add git_common_path() and strbuf_git_common_path() dir.c: rename str(n)cmp_icase to fspath(n)cmp | 23 May 2016, 21:54:29 UTC |
| 9ce2824 | Junio C Hamano | 23 May 2016, 21:54:28 UTC | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op' "git commit --dry-run" reported "No, no, you cannot commit." in one case where "git commit" would have allowed you to commit, and this improves it a little bit ("git commit --dry-run --short" still does not give you the correct answer, for example). This is a stop-gap measure in that "commit --short --dry-run" still gives an incorrect result. * ss/commit-dry-run-resolve-merge-to-no-op: wt-status.c: set commitable bit if there is a meaningful merge. | 23 May 2016, 21:54:28 UTC |
| e7e9f5e | Lars Schneider | 19 May 2016, 09:10:08 UTC | travis-ci: enable Git SVN tests t91xx on Linux Install the "git-svn" package to make the Perl SVN libraries available to the Git SVN tests on Travis-CI Linux build machines. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Eric Wong <e@80x24.org> | 22 May 2016, 20:20:28 UTC |
| d9d501b | Junio C Hamano | 19 May 2016, 19:51:22 UTC | rerere: remove an null statement J6t spotted that previous commit added an empty statement by mistake. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2016, 19:51:22 UTC |
| 3916adf | Junio C Hamano | 18 May 2016, 22:33:57 UTC | Sync with 2.8.3 * maint: Git 2.8.3 | 18 May 2016, 22:33:57 UTC |
| 0f8e831 | Junio C Hamano | 18 May 2016, 21:45:08 UTC | Git 2.8.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 May 2016, 22:32:41 UTC |
| b153d2a | Junio C Hamano | 18 May 2016, 22:11:46 UTC | Merge branch 'jk/push-client-deadlock-fix' Some Windows SDK lacks pthread_sigmask() implementation and fails to compile the recently updated "git push" codepath that uses it. * jk/push-client-deadlock-fix: Windows: only add a no-op pthread_sigmask() when needed Windows: add pthread_sigmask() that does nothing | 18 May 2016, 22:11:46 UTC |
| 6610669 | Junio C Hamano | 18 May 2016, 21:40:15 UTC | Merge branch 'sb/misc-cleanups' into HEAD * sb/misc-cleanups: submodule-config: don't shadow `cache` config.c: drop local variable credential-cache, send_request: close fd when done bundle: don't leak an fd in case of early return abbrev_sha1_in_line: don't leak memory notes: don't leak memory in git_config_get_notes_strategy | 18 May 2016, 21:40:15 UTC |
| 989cbd4 | Junio C Hamano | 18 May 2016, 21:40:15 UTC | Merge branch 'ew/doc-split-pack-disables-bitmap' into HEAD Doc update. * ew/doc-split-pack-disables-bitmap: pack-objects: warn on split packs disabling bitmaps | 18 May 2016, 21:40:15 UTC |
| 10b6646 | Junio C Hamano | 18 May 2016, 21:40:14 UTC | Merge branch 'sb/clean-test-fix' into HEAD * sb/clean-test-fix: t7300: mark test with SANITY | 18 May 2016, 21:40:14 UTC |
| 8d61f0f | Junio C Hamano | 18 May 2016, 21:40:13 UTC | Merge branch 'rn/glossary-typofix' into HEAD * rn/glossary-typofix: Documentation: fix typo 'In such these cases' | 18 May 2016, 21:40:14 UTC |
| 977cb3e | Junio C Hamano | 18 May 2016, 21:40:12 UTC | Merge branch 'ew/normal-to-e' into HEAD * ew/normal-to-e: .mailmap: update to my shorter email address | 18 May 2016, 21:40:12 UTC |
| 258b862 | Junio C Hamano | 18 May 2016, 21:40:12 UTC | Merge branch 'sb/config-exit-status-list' into HEAD Doc update. * sb/config-exit-status-list: config doc: improve exit code listing | 18 May 2016, 21:40:12 UTC |
| 87c5944 | Junio C Hamano | 18 May 2016, 21:40:12 UTC | Merge branch 'rt/string-list-lookup-cleanup' into HEAD Code cleanup. * rt/string-list-lookup-cleanup: string_list: use string-list API in unsorted_string_list_lookup() | 18 May 2016, 21:40:12 UTC |
| 9ba3b14 | Junio C Hamano | 18 May 2016, 21:40:12 UTC | Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD Code fixup. * jk/fix-attribute-macro-in-2.5: remote.c: spell __attribute__ correctly | 18 May 2016, 21:40:12 UTC |
| 777dec6 | Junio C Hamano | 18 May 2016, 21:40:11 UTC | Merge branch 'sg/test-lib-simplify-expr-away' into HEAD Code cleanup. * sg/test-lib-simplify-expr-away: test-lib: simplify '--option=value' parsing | 18 May 2016, 21:40:11 UTC |
| 14af79b | Junio C Hamano | 18 May 2016, 21:40:11 UTC | Merge branch 'nd/remove-unused' into HEAD Code cleanup. * nd/remove-unused: wrapper.c: delete dead function git_mkstemps() dir.c: remove dead function fnmatch_icase() | 18 May 2016, 21:40:11 UTC |
| 13af774 | Junio C Hamano | 18 May 2016, 21:40:10 UTC | Merge branch 'sk/gitweb-highlight-encoding' into HEAD Some multi-byte encoding can have a backslash byte as a later part of one letter, which would confuse "highlight" filter used in gitweb. * sk/gitweb-highlight-encoding: gitweb: apply fallback encoding before highlight | 18 May 2016, 21:40:10 UTC |
| 0968758 | Junio C Hamano | 18 May 2016, 21:40:09 UTC | Merge branch 'ls/travis-submitting-patches' into HEAD * ls/travis-submitting-patches: Documentation: add setup instructions for Travis CI | 18 May 2016, 21:40:09 UTC |
| 1cfb225 | Junio C Hamano | 18 May 2016, 21:40:09 UTC | Merge branch 'js/close-packs-before-gc' into HEAD * js/close-packs-before-gc: t5510: run auto-gc in the foreground | 18 May 2016, 21:40:09 UTC |
| 803fd70 | Junio C Hamano | 18 May 2016, 21:40:08 UTC | Merge branch 'ls/p4-lfs' into HEAD Recent update to Git LFS broke "git p4" by changing the output from its "lfs pointer" subcommand. * ls/p4-lfs: git-p4: fix Git LFS pointer parsing travis-ci: express Linux/OS X dependency versions more clearly travis-ci: update Git-LFS and P4 to the latest version | 18 May 2016, 21:40:08 UTC |
| 7ab6da3 | Junio C Hamano | 18 May 2016, 21:40:08 UTC | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD Fix a broken test. * ls/p4-lfs-test-fix-2.7.0: t9824: fix wrong reference value t9824: fix broken &&-chain in a subshell | 18 May 2016, 21:40:08 UTC |
| f735a50 | Junio C Hamano | 18 May 2016, 21:40:07 UTC | Merge branch 'nf/mergetool-prompt' into HEAD UI consistency improvements. * nf/mergetool-prompt: difftool/mergetool: make the form of yes/no questions consistent | 18 May 2016, 21:40:07 UTC |
| 1f7b196 | Junio C Hamano | 18 May 2016, 21:40:07 UTC | Merge branch 'jd/send-email-to-whom' into HEAD A question by "git send-email" to ask the identity of the sender has been updated. * jd/send-email-to-whom: send-email: fix grammo in the prompt that asks e-mail recipients | 18 May 2016, 21:40:07 UTC |
| f12fffd | Junio C Hamano | 18 May 2016, 21:40:06 UTC | Merge branch 'js/win32-mmap' into HEAD mmap emulation on Windows has been optimized and work better without consuming paging store when not needed. * js/win32-mmap: mmap(win32): avoid expensive fstat() call mmap(win32): avoid copy-on-write when it is unnecessary win32mmap: set errno appropriately | 18 May 2016, 21:40:06 UTC |
| c555e52 | Junio C Hamano | 18 May 2016, 21:40:06 UTC | Merge branch 'jk/push-client-deadlock-fix' into HEAD Some Windows SDK lacks pthread_sigmask() implementation and fails to compile the recently updated "git push" codepath that uses it. * jk/push-client-deadlock-fix: Windows: only add a no-op pthread_sigmask() when needed Windows: add pthread_sigmask() that does nothing t5504: drop sigpipe=ok from push tests fetch-pack: isolate sigpipe in demuxer thread send-pack: isolate sigpipe in demuxer thread run-command: teach async threads to ignore SIGPIPE send-pack: close demux pipe before finishing async process | 18 May 2016, 21:40:06 UTC |
| 920f2ea | Junio C Hamano | 18 May 2016, 21:40:05 UTC | Merge branch 'sb/mv-submodule-fix' into HEAD "git mv old new" did not adjust the path for a submodule that lives as a subdirectory inside old/ directory correctly. * sb/mv-submodule-fix: mv: allow moving nested submodules | 18 May 2016, 21:40:05 UTC |
| e9ef83a | Junio C Hamano | 18 May 2016, 21:40:05 UTC | Merge branch 'da/user-useconfigonly' into HEAD The "user.useConfigOnly" configuration variable makes it an error if users do not explicitly set user.name and user.email. However, its check was not done early enough and allowed another error to trigger, reporting that the default value we guessed from the system setting was unusable. This was a suboptimal end-user experience as we want the users to set user.name/user.email without relying on the auto-detection at all. * da/user-useconfigonly: ident: give "please tell me" message upon useConfigOnly error ident: check for useConfigOnly before auto-detection of name/email | 18 May 2016, 21:40:05 UTC |
| 787a490 | Junio C Hamano | 18 May 2016, 21:40:04 UTC | Merge branch 'ld/p4-test-py3' into HEAD The test scripts for "git p4" (but not "git p4" implementation itself) has been updated so that they would work even on a system where the installed version of Python is python 3. * ld/p4-test-py3: git-p4 tests: time_in_seconds should use $PYTHON_PATH git-p4 tests: work with python3 as well as python2 git-p4 tests: cd to / before running python | 18 May 2016, 21:40:04 UTC |
| 1f66975 | Junio C Hamano | 17 May 2016, 21:47:06 UTC | Thirteenth batch for 2.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2016, 21:47:06 UTC |
| be6ec17 | Junio C Hamano | 17 May 2016, 21:38:39 UTC | Merge branch 'kf/gpg-sig-verification-doc' Documentation for "git merge --verify-signatures" has been updated to clarify that the signature of only the commit at the tip is verified. Also the phrasing used for signature and key validity is adjusted to align with that used by OpenPGP. * kf/gpg-sig-verification-doc: Documentation: clarify signature verification | 17 May 2016, 21:38:39 UTC |
| bfc99b6 | Junio C Hamano | 17 May 2016, 21:38:39 UTC | Merge branch 'js/windows-dotgit' On Windows, .git and optionally any files whose name starts with a dot are now marked as hidden, with a core.hideDotFiles knob to customize this behaviour. * js/windows-dotgit: mingw: remove unnecessary definition mingw: introduce the 'core.hideDotFiles' setting | 17 May 2016, 21:38:39 UTC |
| 5bfc50d | Junio C Hamano | 17 May 2016, 21:38:37 UTC | Merge branch 'va/mailinfo-doc-typofix' Typofix. * va/mailinfo-doc-typofix: Documentation/git-mailinfo: fix typo | 17 May 2016, 21:38:38 UTC |
| 3727318 | Junio C Hamano | 17 May 2016, 21:38:36 UTC | Merge branch 'jk/test-send-sh-x-trace-elsewhere' Running tests with '-x' option to trace the individual command executions is a useful way to debug test scripts, but some tests that capture the standard error stream and check what the command said can be broken with the trace output mixed in. When running our tests under "bash", however, we can redirect the trace output to another file descriptor to keep the standard error of programs being tested intact. * jk/test-send-sh-x-trace-elsewhere: test-lib: set BASH_XTRACEFD automatically | 17 May 2016, 21:38:36 UTC |
| 848b99b | Junio C Hamano | 17 May 2016, 21:38:35 UTC | Merge branch 'js/http-custom-headers' Update tests for "http.extraHeaders=<header>" to be portable back to Apache 2.2 (the original depended on <RequireAll/> which is a more recent feature). * js/http-custom-headers: submodule: ensure that -c http.extraheader is heeded t5551: make the test for extra HTTP headers more robust tests: adjust the configuration for Apache 2.2 | 17 May 2016, 21:38:35 UTC |
| fd704b1 | Junio C Hamano | 17 May 2016, 21:38:35 UTC | Merge branch 'jk/rebase-interative-eval-fix' Portability enhancement for "rebase -i" to help platforms whose shell does not like "for i in <empty>" (which is not POSIX-kosher). * jk/rebase-interative-eval-fix: rebase--interactive: avoid empty list in shell for-loop | 17 May 2016, 21:38:35 UTC |
| 6bfb7de | Junio C Hamano | 17 May 2016, 21:38:34 UTC | Merge branch 'jc/fsck-nul-in-commit' "git fsck" learned to catch NUL byte in a commit object as potential error and warn. * jc/fsck-nul-in-commit: fsck: detect and warn a commit with embedded NUL fsck_commit_buffer(): do not special case the last validation | 17 May 2016, 21:38:34 UTC |
| ef687db | Junio C Hamano | 17 May 2016, 21:38:33 UTC | Merge branch 'nd/test-helpers' Switching between 'master' and 'next', between which the paths to test helper binaries have changed, did not update bin-wrappers/* scripts used in tests, causing false test failures. * nd/test-helpers: wrap-for-bin.sh: regenerate bin-wrappers when switching branches | 17 May 2016, 21:38:33 UTC |
| a046941 | Junio C Hamano | 17 May 2016, 21:38:33 UTC | Merge branch 'ls/travis-build-doc' CI test was taught to build documentation pages. * ls/travis-build-doc: travis-ci: build documentation | 17 May 2016, 21:38:33 UTC |
| 243a7f0 | Junio C Hamano | 17 May 2016, 21:38:32 UTC | Merge branch 'jc/ll-merge-internal' "git rerere" can get confused by conflict markers deliberately left by the inner merge step, because they are indistinguishable from the real conflict markers left by the outermost merge which are what the end user and "rerere" need to look at. This was fixed by making the conflict markers left by the inner merges a bit longer. * jc/ll-merge-internal: t6036: remove pointless test that expects failure ll-merge: use a longer conflict marker for internal merge ll-merge: fix typo in comment | 17 May 2016, 21:38:32 UTC |
| 5f232ec | Junio C Hamano | 17 May 2016, 21:38:31 UTC | Merge branch 'jc/linkgit-fix' Many 'linkgit:<git documentation page>' references were broken, which are all fixed with this. * jc/linkgit-fix: Documentation: fix linkgit references | 17 May 2016, 21:38:31 UTC |
| b7f6142 | Junio C Hamano | 17 May 2016, 21:38:30 UTC | Merge branch 'va/i18n-remote-comment-to-align' Message fix. * va/i18n-remote-comment-to-align: i18n: remote: add comment for translators | 17 May 2016, 21:38:30 UTC |
| a736214 | Junio C Hamano | 17 May 2016, 21:38:29 UTC | Merge branch 'tb/t5601-sed-fix' Test fix. * tb/t5601-sed-fix: t5601: Remove trailing space in sed expression | 17 May 2016, 21:38:29 UTC |
| 40cfc95 | Junio C Hamano | 17 May 2016, 21:38:28 UTC | Merge branch 'nd/error-errno' The code for warning_errno/die_errno has been refactored and a new error_errno() reporting helper is introduced. * nd/error-errno: (41 commits) wrapper.c: use warning_errno() vcs-svn: use error_errno() upload-pack.c: use error_errno() unpack-trees.c: use error_errno() transport-helper.c: use error_errno() sha1_file.c: use {error,die,warning}_errno() server-info.c: use error_errno() sequencer.c: use error_errno() run-command.c: use error_errno() rerere.c: use error_errno() and warning_errno() reachable.c: use error_errno() mailmap.c: use error_errno() ident.c: use warning_errno() http.c: use error_errno() and warning_errno() grep.c: use error_errno() gpg-interface.c: use error_errno() fast-import.c: use error_errno() entry.c: use error_errno() editor.c: use error_errno() diff-no-index.c: use error_errno() ... | 17 May 2016, 21:38:28 UTC |
| 8648eac | Junio C Hamano | 17 May 2016, 21:38:28 UTC | Merge branch 'jc/test-seq' Test fix. * jc/test-seq: test-lib-functions.sh: rewrite test_seq without Perl test-lib-functions.sh: remove misleading comment on test_seq | 17 May 2016, 21:38:28 UTC |
| 36d2b9a | Junio C Hamano | 17 May 2016, 21:38:27 UTC | Merge branch 'es/test-gpg-tags' Test fix. * es/test-gpg-tags: t6302: simplify non-gpg cases | 17 May 2016, 21:38:27 UTC |
| d130bf4 | Junio C Hamano | 17 May 2016, 21:38:26 UTC | Merge branch 'ak/t4151-ls-files-could-be-empty' Test fix. * ak/t4151-ls-files-could-be-empty: t4151: make sure argument to 'test -z' is given | 17 May 2016, 21:38:26 UTC |
| e059388 | Junio C Hamano | 17 May 2016, 21:38:25 UTC | Merge branch 'jk/submodule-c-credential' An earlier addition of "sanitize_submodule_env" with 14111fc4 (git: submodule honor -c credential.* from command line, 2016-02-29) turned out to be a convoluted no-op; implement what it wanted to do correctly, and stop filtering settings given via "git -c var=val". * jk/submodule-c-credential: submodule: stop sanitizing config options submodule: use prepare_submodule_repo_env consistently submodule--helper: move config-sanitizing to submodule.c submodule: export sanitized GIT_CONFIG_PARAMETERS t5550: break submodule config test into multiple sub-tests t5550: fix typo in $HTTPD_URL | 17 May 2016, 21:38:25 UTC |
| 7a7d085 | Junio C Hamano | 17 May 2016, 21:38:24 UTC | Merge branch 'nd/remote-plural-ours-plus-theirs' Message fix. * nd/remote-plural-ours-plus-theirs: remote.c: specify correct plural form in "commit diverge" message | 17 May 2016, 21:38:24 UTC |
| 34698ba | Junio C Hamano | 17 May 2016, 21:38:23 UTC | Merge branch 'bn/config-doc-tt-varnames' Doc formatting fixes. * bn/config-doc-tt-varnames: config: consistently format $variables in monospaced font | 17 May 2016, 21:38:23 UTC |
| e5e7a91 | Junio C Hamano | 17 May 2016, 21:38:22 UTC | Merge branch 'va/i18n-misc-updates' Mark several messages for translation. * va/i18n-misc-updates: i18n: unpack-trees: avoid substituting only a verb in sentences i18n: builtin/pull.c: split strings marked for translation i18n: builtin/pull.c: mark placeholders for translation i18n: git-parse-remote.sh: mark strings for translation i18n: branch: move comment for translators i18n: branch: unmark string for translation i18n: builtin/rm.c: remove a comma ',' from string i18n: unpack-trees: mark strings for translation i18n: builtin/branch.c: mark option for translation i18n: index-pack: use plural string instead of normal one | 17 May 2016, 21:38:23 UTC |
| b232439 | Junio C Hamano | 17 May 2016, 21:38:22 UTC | Merge branch 'js/t3404-typofix' * js/t3404-typofix: t3404: fix typo | 17 May 2016, 21:38:22 UTC |
| 2049e7e | Junio C Hamano | 17 May 2016, 21:38:21 UTC | Merge branch 'sb/z-is-gnutar-ism' * sb/z-is-gnutar-ism: t6041: do not compress backup tar file t3513: do not compress backup tar file | 17 May 2016, 21:38:21 UTC |
| 3241d4f | Junio C Hamano | 17 May 2016, 21:38:20 UTC | Merge branch 'lp/typofixes' * lp/typofixes: typofix: assorted typofixes in comments, documentation and messages | 17 May 2016, 21:38:20 UTC |
| 21b2e60 | Junio C Hamano | 17 May 2016, 21:38:19 UTC | Merge branch 'sb/submodule-deinit-all' Correct faulty recommendation to use "git submodule deinit ." when de-initialising all submodules, which would result in a strange error message in a pathological corner case. * sb/submodule-deinit-all: submodule deinit: require '--all' instead of '.' for all submodules | 17 May 2016, 21:38:20 UTC |
| fd87e70 | Junio C Hamano | 17 May 2016, 21:38:19 UTC | Merge branch 'jc/config-pathname-type' Consolidate description of tilde-expansion that is done to configuration variables that take pathname to a single place. * jc/config-pathname-type: config: describe 'pathname' value type | 17 May 2016, 21:38:19 UTC |
| 459000e | Junio C Hamano | 17 May 2016, 21:38:18 UTC | Merge branch 'bn/http-cookiefile-config' "http.cookieFile" configuration variable clearly wants a pathname, but we forgot to treat it as such by e.g. applying tilde expansion. * bn/http-cookiefile-config: http: expand http.cookieFile as a path Documentation: config: improve word ordering for http.cookieFile | 17 May 2016, 21:38:18 UTC |
| 6675f50 | Junio C Hamano | 17 May 2016, 21:38:17 UTC | Merge branch 'ab/hooks' A new configuration variable core.hooksPath allows customizing where the hook directory is. * ab/hooks: hooks: allow customizing where the hook directory is githooks.txt: minor improvements to the grammar & phrasing githooks.txt: amend dangerous advice about 'update' hook ACL githooks.txt: improve the intro section | 17 May 2016, 21:38:17 UTC |
| f2c96ce | Junio C Hamano | 17 May 2016, 21:38:16 UTC | Merge branch 'sb/submodule-init' Update of "git submodule" to move pieces of logic to C continues. * sb/submodule-init: submodule init: redirect stdout to stderr submodule--helper update-clone: abort gracefully on missing .gitmodules submodule init: fail gracefully with a missing .gitmodules file submodule: port init from shell to C submodule: port resolve_relative_url from shell to C | 17 May 2016, 21:38:17 UTC |
| 366f9ce | David Aguilar | 16 May 2016, 18:05:37 UTC | difftool: handle unmerged files in dir-diff mode When files are unmerged they can show up as both unmerged and modified in the output of `git diff --raw`. This causes difftool's dir-diff to create filesystem entries for the same path twice, which fails when it encounters a duplicate path. Ensure that each worktree path is only processed once. Add a test to demonstrate the breakage. Reported-by: Jan Smets <jan@smets.cx> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2016, 21:53:05 UTC |
| 951b551 | David Aguilar | 16 May 2016, 18:05:36 UTC | difftool: initialize variables for readability The code always goes into one of the two conditional blocks but make it clear that not doing so is an error condition by setting $ok to 0. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2016, 21:53:03 UTC |
| 268ef4d | Jeff King | 13 May 2016, 20:47:33 UTC | always quote shell arguments to test -z/-n In shell code like: test -z $foo test -n $foo that does not quote its arguments, it's easy to think that it is actually looking at the contents of $foo in each case. But if $foo is empty, then "test" does not see any argument at all! The results are quite subtle. POSIX specifies that test's behavior depends on the number of arguments it sees, and if $foo is empty, it sees only one. The behavior in this case is: 1 argument: Exit true (0) if $1 is not null; otherwise, exit false. So in the "-z $foo" case, if $foo is empty, then we check that "-z" is non-null, and it returns success. Which happens to match what we expected. But for "-n $foo", if $foo is empty, we'll see that "-n" is non-null and still return success. That's the opposite of what we intended! Furthermore, if $foo contains whitespace, we'll end up with more than 2 arguments. The results in this case are generally unspecified (unless the first part of $foo happens to be a valid binary operator, in which case the results are specified but certainly not what we intended). And on top of this, even though "test -z $foo" _should_ work for the empty case, some older shells (reportedly ksh88) complain about the missing argument. So let's make sure we consistently quote our variable arguments to "test". After this patch, the results of: git grep 'test -[zn] [^"]' are empty. Reported-by: Armin Kunaschik <megabreit@googlemail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 May 2016, 17:37:29 UTC |
| 2a86cb6 | Jeff King | 13 May 2016, 20:47:28 UTC | t9103: modernize test style The main goal here was to avoid double-quotes for surrounding the test snippet, since it makes the code hard to read (and to grep for common problems). But while we're here, we can fix a few other things: - use test_path_* helpers, which are more robust and give better error messages - only "cd" inside a subshell, which leaves the environment pristine if further tests are added - consistently quote shell arguments. These aren't wrong if we assume find-rev output doesn't have any whitespace, but it doesn't hurt to be careful. - replace the old-style 'test x$foo = x' with 'test -z "$foo"'. Besides the quoting fix, this is the form we generally use in our test suite. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 May 2016, 17:37:29 UTC |
| 9874576 | Jeff King | 13 May 2016, 20:47:24 UTC | t9107: switch inverted single/double quotes in test One of the test snippets in t9107 is enclosed in double quotes, but then uses single quotes to surround an interpolated variable inside the snippet, like: test_expect_success '...' " test -n '$head' " This happens to work because the variable is interpolated _before_ the snippet is run, and the result is eval'd. So as long as the variable does not contain any single quotes, the two are equivalent. And it doesn't, as we know it is a sha1 from rev-parse above. But this construct is unnecessarily confusing. But we can go a step further in cleaning up. The test is really checking that a particular ref has a value. Rather than checking if rev-parse produced output, we can just move rev-parse into the test itself, and rely on the exit code from --verify. Nobody else cares about the $head variable at all. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 May 2016, 17:37:29 UTC |
| f831acc | Jeff King | 13 May 2016, 20:47:21 UTC | t9107: use "return 1" instead of "exit 1" When a test runs a loop, it cannot rely on the usual &&-chaining to propagate a failure inside the loop; it needs to break out with a failure signal. However, unless you are in a subshell, doing so with "exit 1" will exit the entire test script, not just the test snippet we are in (and cause the harness to complain that test_done was never reached). So the fundamental point of this patch is s/exit/return/. But while we're there, let's fix a number of style and readability issues: - snippets in double-quotes need an extra layer of quoting for their meta-characters; let's avoid that by using single quotes - accumulating loop output by appending to a file in each iteration is brittle, as it can be affected by content left in the file by earlier tests. Instead, it's better to redirect stdout for the whole loop, so we know the output only comes from that loop. - using "test -z" to check that diff output is empty is overly verbose; we can just ask diff to use --exit-code. - we can factor out long lists of refs to make it more obvious we're using the same ones in each loop - subshells are unnecessary when ending an &&-chain with "|| return 1" - minor style fixups like space-after-redirection, and "do" and "done" on their own lines Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 May 2016, 17:37:17 UTC |
| 90a78b8 | Alexander Rinass | 13 May 2016, 20:41:02 UTC | diff: run arguments through precompose_argv When running diff commands, a pathspec containing decomposed unicode code points is not converted to precomposed unicode form under Mac OS X, but we normalize the paths in the index and the history to precomposed form on that platform. As a result, the pathspec would not match and no diff is shown. Unlike many builtin commands, the "diff" family of commands do not use parse_options(), which is how other builtin commands indirectly call precompose_argv() to normalize argv[] into precomposed form on Mac OSX. Teach these commands to call precompose_argv() themselves. Note that precomopose_argv() normalizes not just paths but all command line arguments, so things like "git diff -G $string" when $string has the decomposed form would first be normalized into the precomposed form and would stop hitting the same string in the decomposed form in the diff output with this change. It is not a problem per-se, as "log" family of commands already use parse_options() and call precompose_argv()--we can think of this change as making the "diff" family of commands behave in a similar way as the commands in the "log" family. Signed-off-by: Alexander Rinass <alex@fournova.com> Helped-by: Torsten Bòˆgershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2016, 21:35:49 UTC |
| 577dfd0 | Jeff King | 13 May 2016, 20:47:18 UTC | t9100,t3419: enclose all test code in single-quotes A few tests here use double-quotes around the snippets of shell code to run the tests. None of these tests wants to do any interpolation at all, and it just leads to an extra layer of quoting around all double-quotes and dollar signs inside the snippet. Let's switch to single quotes, like most other test scripts. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2016, 21:00:03 UTC |
| e1c0c15 | Jeff King | 13 May 2016, 20:47:14 UTC | t/lib-git-svn: drop $remote_git_svn and $git_svn_id These variables were added in 16805d3 (t/t91XX-svn: start removing use of "git-" from these tests, 2008-09-08) so that running: git grep git- would return fewer hits. At the time, we were transitioning away from the use of the "dashed" git-foo form. That transition has been over for years, and grepping for "git-" in the test suite yields thousands of hits anyway (all presumably false positives). With their original purpose gone, these variables serve only to obfuscate the tests. Let's get rid of them. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2016, 20:59:58 UTC |
| edec370 | Junio C Hamano | 13 May 2016, 20:23:24 UTC | Twelfth batch for 2.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2016, 20:23:24 UTC |
| 4f50670 | Junio C Hamano | 13 May 2016, 20:18:28 UTC | Merge branch 'sb/submodule-module-list-pathspec-fix' * sb/submodule-module-list-pathspec-fix: submodule deinit test: fix broken && chain in subshell | 13 May 2016, 20:18:28 UTC |
| 50b26f5 | Junio C Hamano | 13 May 2016, 20:18:27 UTC | Merge branch 'jc/commit-tree-ignore-commit-gpgsign' "git commit-tree" plumbing command required the user to always sign its result when the user sets the commit.gpgsign configuration variable, which was an ancient mistake. Rework "git rebase" that relied on this mistake so that it reads commit.gpgsign and pass (or not pass) the -S option to "git commit-tree" to keep the end-user expectation the same, while teaching "git commit-tree" to ignore the configuration variable. This will stop requiring the users to sign commit objects used internally as an implementation detail of "git stash". * jc/commit-tree-ignore-commit-gpgsign: commit-tree: do not pay attention to commit.gpgsign | 13 May 2016, 20:18:27 UTC |
| 17130a7 | Matthieu Moy | 13 May 2016, 17:00:41 UTC | git-multimail: update to release 1.3.1 The changes are described in CHANGES. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2016, 19:54:06 UTC |
| 05a5869 | Keller Fuchs | 13 May 2016, 09:51:01 UTC | Documentation: clarify signature verification Clarify that "merge --verify-signatures" checks the signature on the tip commit of the history being merged. Uniformise the vocabulary used wrt. key/signature validity with OpenPGP: - a signature is valid if made by a key with a valid uid; - in the default trust-model, a uid is valid if signed by a trusted key; - a key is trusted if the (local) user set a trust level for it. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Keller Fuchs <KellerFuchs@hashbang.sh> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2016, 19:37:44 UTC |
| e4cfe74 | Johannes Schindelin | 13 May 2016, 13:26:03 UTC | perf: run "rebase -i" under perf This developer spent a lot of time trying to speed up the interactive rebase, in particular on Windows. And will continue to do so. To make it easier to demonstrate the performance improvement, let's have a reproducible performance test. The topic branch we use to test performance was found using these shell commands (essentially searching for a long-enough topic branch in Git's own history that touched the same file multiple times): git rev-list --parents origin/master | grep ' .* ' | while read commit rest do patch_count=$(git rev-list --count $commit^..$commit^2) test $patch_count -gt 20 || continue merges="$(git rev-list --parents $commit^..$commit^2 | grep ' .* ')" test -z "$merges" || continue patches_per_file="$(git log --pretty=%H --name-only \ $commit^..$commit^2 | grep -v '^$' | sort | uniq -c -d | sort -n -r)" test -n "$patches_per_file" && test 20 -lt $(echo "$patches_per_file" | sed -n '1s/^ *\([0-9]*\).*/\1/p') || continue printf 'commit %s\n%s\n' "$commit" "$patches_per_file" done Note that we can get away with *not* having to reset to the original branch tip before rebasing: we switch the first two "pick" lines every time, so we end up with the same patch order after two rebases, and the complexity of both rebases is equivalent. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2016, 18:07:12 UTC |
| 7501b59 | Johannes Schindelin | 13 May 2016, 13:25:58 UTC | perf: make the tests work in worktrees This patch makes perf-lib.sh more robust so that it can run correctly even inside a worktree. For example, it assumed that $GIT_DIR/objects is the objects directory (which is not the case for worktrees) and it used the commondir file verbatim, even if it contained a relative path. Furthermore, the setup code expected `git rev-parse --git-dir` to spit out a relative path, which is also not true for worktrees. Let's just change the code to accept both relative and absolute paths, by avoiding the `cd` into the copied working directory. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2016, 18:04:07 UTC |
