| ac9e350 | Michael Weiser | 11 April 2016, 13:44:06 UTC | Extend runtime prefix computation Make git fully relocatable at runtime extending the runtime prefix calculation. Handle absolute and relative paths in argv0. Handle no path at all in argv0 in a system-specific manner. Replace assertions with initialised variables and checks that lead to fallback to the static prefix. | 15 April 2016, 13:20:06 UTC |
| b8b4d93 | Junio C Hamano | 15 April 2016, 01:59:09 UTC | Merge branch 'maint' * maint: Prepare for 2.8.2 Start preparing for 2.8.2 | 15 April 2016, 01:59:09 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 |
| dc0db2c | Junio C Hamano | 13 April 2016, 21:19:29 UTC | Fourth batch for post 2.8 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2016, 21:19:47 UTC |
| 6680016 | Junio C Hamano | 13 April 2016, 21:12:40 UTC | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' 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 | 13 April 2016, 21:12:41 UTC |
| f044297 | Junio C Hamano | 13 April 2016, 21:12:39 UTC | Merge branch 'mg/complete-cherry-mark-to-log' The completion scripts (in contrib/) did not include the "--cherry-mark" option when completing "git log <HT>". * mg/complete-cherry-mark-to-log: completion: complete --cherry-mark for git log | 13 April 2016, 21:12:40 UTC |
| b330051 | Junio C Hamano | 13 April 2016, 21:12:38 UTC | Merge branch 'ep/trace-doc-sample-fix' Fix a typo in an example in the trace API documentation. * ep/trace-doc-sample-fix: api-trace.txt: fix typo | 13 April 2016, 21:12:39 UTC |
| 8c9dec9 | Junio C Hamano | 13 April 2016, 21:12:37 UTC | Merge branch 'jc/makefile-redirection-stderr' A minor fix in the Makefile. * jc/makefile-redirection-stderr: Makefile: fix misdirected redirections | 13 April 2016, 21:12:38 UTC |
| cafef3d | Junio C Hamano | 13 April 2016, 21:12:36 UTC | Merge branch 'lt/pretty-expand-tabs' When "git log" shows the log message indented by 4-spaces, the remainder of a line after a HT does not align in the way the author originally intended. The command now expands tabs by default in such a case, and allows the users to override it with a new option, '--no-expand-tabs'. * lt/pretty-expand-tabs: pretty: test --expand-tabs pretty: allow tweaking tabwidth in --expand-tabs pretty: enable --expand-tabs by default for selected pretty formats pretty: expand tabs in indented logs to make things line up properly | 13 April 2016, 21:12:36 UTC |
| 7c137bb | Junio C Hamano | 13 April 2016, 21:12:36 UTC | Merge branch 'mj/pull-rebase-autostash' "git pull --rebase" learned "--[no-]autostash" option, so that the rebase.autostash configuration variable set to true can be overridden from the command line. * mj/pull-rebase-autostash: t5520: test --[no-]autostash with pull.rebase=true t5520: reduce commom lines of code t5520: factor out common "failing autostash" code t5520: factor out common "successful autostash" code t5520: use better test to check stderr output t5520: ensure consistent test conditions t5520: use consistent capitalization in test titles pull --rebase: add --[no-]autostash flag git-pull.c: introduce git_pull_config() | 13 April 2016, 21:12:36 UTC |
| 34e859d | Junio C Hamano | 13 April 2016, 21:12:36 UTC | Merge branch 'jn/mergetools-examdiff' "git mergetools" learned to drive ExamDiff. * jn/mergetools-examdiff: mergetools: add support for ExamDiff mergetools: create mergetool_find_win32_cmd() helper function for winmerge | 13 April 2016, 21:12:36 UTC |
| 7929674 | Junio C Hamano | 13 April 2016, 21:12:35 UTC | Merge branch 'es/format-patch-doc-hide-no-patch' "git format-patch --help" showed `-s` and `--no-patch` as if these are valid options to the command. We already hide `--patch` option from the documentation, because format-patch is about showing the diff, and the documentation now hides these options as well. * es/format-patch-doc-hide-no-patch: git-format-patch.txt: don't show -s as shorthand for multiple options | 13 April 2016, 21:12:35 UTC |
| dd27384 | Junio C Hamano | 13 April 2016, 21:12:34 UTC | Merge branch 'js/mingw-tests-2.8' Code clean-up. * js/mingw-tests-2.8: Windows: shorten code by re-using convert_slashes() | 13 April 2016, 21:12:34 UTC |
| 5b3b015 | Junio C Hamano | 13 April 2016, 21:12:34 UTC | Merge branch 'cc/apply' Minor code clean-up. * cc/apply: builtin/apply: free patch when parse_chunk() fails builtin/apply: handle parse_binary() failure apply: remove unused call to free() in gitdiff_{old,new}name() builtin/apply: get rid of useless 'name' variable | 13 April 2016, 21:12:34 UTC |
| fc452ae | Junio C Hamano | 13 April 2016, 21:12:34 UTC | Merge branch 'sb/misc-cleanups' Assorted minor clean-ups. * sb/misc-cleanups: 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 | 13 April 2016, 21:12:34 UTC |
| 5250af4 | Junio C Hamano | 13 April 2016, 21:12:33 UTC | Merge branch 'sk/send-pack-all-fix' "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 | 13 April 2016, 21:12:33 UTC |
| 26effb8 | Junio C Hamano | 13 April 2016, 21:12:32 UTC | Merge branch 'sg/diff-multiple-identical-renames' "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 | 13 April 2016, 21:12:32 UTC |
| 69d65bc | Junio C Hamano | 13 April 2016, 21:12:31 UTC | Merge branch 'kn/for-each-tag-branch' A minor documentation update. * kn/for-each-tag-branch: for-each-ref: fix description of '--contains' in manpage | 13 April 2016, 21:12:31 UTC |
| 4fca4e3 | Junio C Hamano | 13 April 2016, 21:12:30 UTC | Merge branch 'ky/branch-d-worktree' When "git worktree" feature is in use, "git branch -d" allowed deletion of a branch that is checked out in another worktree * ky/branch-d-worktree: branch -d: refuse deleting a branch which is currently checked out | 13 April 2016, 21:12:30 UTC |
| 0d8683c | Junio C Hamano | 13 April 2016, 21:12:30 UTC | Merge branch 'rz/worktree-no-checkout' "git worktree add" can be given "--no-checkout" option to only create an empty worktree without checking out the files. * rz/worktree-no-checkout: worktree: add: introduce --checkout option | 13 April 2016, 21:12:30 UTC |
| 5c788e7 | Junio C Hamano | 13 April 2016, 21:12:30 UTC | Merge branch 'rt/rebase-i-shorten-stop-report' The commit object name reported when "rebase -i" stops has been shortened. * rt/rebase-i-shorten-stop-report: rebase-i: print an abbreviated hash when stop for editing | 13 April 2016, 21:12:30 UTC |
| 8b7475a | Junio C Hamano | 13 April 2016, 21:12:29 UTC | Merge branch 'rt/completion-help' Shell completion (in contrib/) updates. * rt/completion-help: completion: add 'revisions' and 'everyday' to 'git help' completion: add option '--guides' to 'git help' | 13 April 2016, 21:12:29 UTC |
| 73385f2 | Junio C Hamano | 13 April 2016, 21:12:29 UTC | Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' Minor code cleanup. * ak/use-hashmap-iter-first-in-submodule-config: submodule-config: use hashmap_iter_first() | 13 April 2016, 21:12:29 UTC |
| 907c416 | Junio C Hamano | 13 April 2016, 21:12:28 UTC | Merge branch 'jk/check-repository-format' The repository set-up sequence has been streamlined (the biggest change is that there is no longer git_config_early()), so that we do not attempt to look into refs/* when we know we do not have a Git repository. * jk/check-repository-format: verify_repository_format: mark messages for translation setup: drop repository_format_version global setup: unify repository version callbacks init: use setup.c's repo version verification setup: refactor repo format reading and verification config: drop git_config_early check_repository_format_gently: stop using git_config_early lazily load core.sharedrepository wrap shared_repository global in get/set accessors setup: document check_repository_format() | 13 April 2016, 21:12:28 UTC |
| 7b0d47b | Junio C Hamano | 08 April 2016, 21:34:11 UTC | Third batch for post 2.8 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2016, 21:34:11 UTC |
| 4af4612 | Junio C Hamano | 08 April 2016, 21:29:13 UTC | Merge branch 'ss/msvc' 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 | 08 April 2016, 21:29:13 UTC |
| b0fbcf0 | Junio C Hamano | 08 April 2016, 21:29:13 UTC | Merge branch 'oa/doc-diff-check' A minor documentation update. * oa/doc-diff-check: Documentation: git diff --check detects conflict markers | 08 April 2016, 21:29:13 UTC |
| 8fdfaf0 | Junio C Hamano | 08 April 2016, 21:29:12 UTC | Merge branch 'pb/opt-cmdmode-doc' Minor API documentation update. * pb/opt-cmdmode-doc: api-parse-options.txt: document OPT_CMDMODE() | 08 April 2016, 21:29:13 UTC |
| 11cfcc5 | Junio C Hamano | 08 April 2016, 21:29:12 UTC | Merge branch 'nd/apply-report-skip' "git apply -v" learned to report paths in the patch that were skipped via --include/--exclude mechanism or being outside the current working directory. * nd/apply-report-skip: apply: report patch skipping in verbose mode | 08 April 2016, 21:29:12 UTC |
| efe778c | Junio C Hamano | 08 April 2016, 21:29:12 UTC | Merge branch 'nd/apply-doc' A minor documentation update. * nd/apply-doc: git-apply.txt: mention the behavior inside a subdir git-apply.txt: remove a space | 08 April 2016, 21:29:12 UTC |
| d04aa7e | Junio C Hamano | 08 April 2016, 21:29:11 UTC | Merge branch 'jc/merge-refuse-new-root' "git merge" used to allow merging two branches that have no common base by default, which led to a brand new history of an existing project created and then get pulled by an unsuspecting maintainer, which allowed an unnecessary parallel history merged into the existing project. The command has been taught not to allow this by default, with an escape hatch "--allow-unrelated-histories" option to be used in a rare event that merges histories of two projects that started their lives independently. * jc/merge-refuse-new-root: merge: refuse to create too cool a merge by default | 08 April 2016, 21:29:11 UTC |
| 72d917a | Junio C Hamano | 06 April 2016, 18:44:24 UTC | Second batch for post 2.8 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 April 2016, 18:44:24 UTC |
| a2595f0 | Junio C Hamano | 06 April 2016, 18:39:13 UTC | Merge branch 'la/tag-force-signing-annotated-tags' "git tag" can create an annotated tag without explicitly given an "-a" (or "-s") option (i.e. when a tag message is given). A new configuration variable, tag.forceSignAnnotated, can be used to tell the command to create signed tag in such a situation. * la/tag-force-signing-annotated-tags: tag: add the option to force signing of annotated tags | 06 April 2016, 18:39:13 UTC |
| 01e1d54 | Junio C Hamano | 06 April 2016, 18:39:12 UTC | Merge branch 'jk/submodule-c-credential' "git -c credential.<var>=<value> submodule" can now be used to propagate configuration variables related to credential helper down to the submodules. * jk/submodule-c-credential: git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS git: submodule honor -c credential.* from command line quote: implement sq_quotef() submodule: fix segmentation fault in submodule--helper clone submodule: fix submodule--helper clone usage submodule: check argc count for git submodule--helper clone submodule: don't pass empty string arguments to submodule--helper clone | 06 April 2016, 18:39:12 UTC |
| aad627e | Junio C Hamano | 06 April 2016, 18:39:11 UTC | Merge branch 'jv/merge-nothing-into-void' "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 | 06 April 2016, 18:39:11 UTC |
| a6822e4 | Junio C Hamano | 06 April 2016, 18:39:10 UTC | Merge branch 'ss/commit-squash-msg' 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 | 06 April 2016, 18:39:10 UTC |
| 2c657ed | Junio C Hamano | 06 April 2016, 18:39:09 UTC | Merge branch 'sb/rebase-x' "git rebase -x" can be used without passing "-i" option. * sb/rebase-x: t3404: cleanup double empty lines between tests rebase: decouple --exec from --interactive | 06 April 2016, 18:39:09 UTC |
| 3e95e47 | Junio C Hamano | 06 April 2016, 18:39:08 UTC | Merge branch 'jk/test-httpd-config-nosystem' 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 | 06 April 2016, 18:39:08 UTC |
| f4ee510 | Junio C Hamano | 06 April 2016, 18:39:07 UTC | Merge branch 'jk/send-email-rtrim-mailrc-alias' "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 | 06 April 2016, 18:39:07 UTC |
| 67827f5 | Junio C Hamano | 06 April 2016, 18:39:06 UTC | Merge branch 'jk/credential-cache-comment-exit' A code clarification. * jk/credential-cache-comment-exit: credential-cache--daemon: clarify "exit" action semantics | 06 April 2016, 18:39:06 UTC |
| 2f03d17 | Junio C Hamano | 06 April 2016, 18:39:05 UTC | Merge branch 'sb/clone-t57-t56' Rename bunch of tests on "git clone" for better organization. * sb/clone-t57-t56: clone tests: rename t57* => t56* | 06 April 2016, 18:39:05 UTC |
| 1d851b9 | Junio C Hamano | 06 April 2016, 18:39:05 UTC | Merge branch 'ls/p4-map-user' "git p4" now allows P4 author names to be mapped to Git author names. * ls/p4-map-user: git-p4: map a P4 user to Git author name and email address | 06 April 2016, 18:39:05 UTC |
| 5e533f8 | Junio C Hamano | 06 April 2016, 18:39:04 UTC | Merge branch 'cc/doc-recommend-performance-trace-to-file' A minor documentation update. * cc/doc-recommend-performance-trace-to-file: Documentation: talk about pager in api-trace.txt | 06 April 2016, 18:39:04 UTC |
| 235bdc8 | Junio C Hamano | 06 April 2016, 18:39:03 UTC | Merge branch 'pb/t7502-drop-dup' Code clean-up. * pb/t7502-drop-dup: t/t7502 : drop duplicate test | 06 April 2016, 18:39:04 UTC |
| e094194 | Junio C Hamano | 06 April 2016, 18:39:02 UTC | Merge branch 'da/mergetool-delete-delete-conflict' "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 | 06 April 2016, 18:39:02 UTC |
| bdebbeb | Junio C Hamano | 06 April 2016, 18:39:01 UTC | Merge branch 'sb/submodule-parallel-update' A major part of "git submodule update" has been ported to C to take advantage of the recently added framework to run download tasks in parallel. * sb/submodule-parallel-update: clone: allow an explicit argument for parallel submodule clones submodule update: expose parallelism to the user submodule helper: remove double 'fatal: ' prefix git submodule update: have a dedicated helper for cloning run_processes_parallel: rename parameters for the callbacks run_processes_parallel: treat output of children as byte array submodule update: direct error message to stderr fetching submodules: respect `submodule.fetchJobs` config option submodule-config: drop check against NULL submodule-config: keep update strategy around | 06 April 2016, 18:39:01 UTC |
| 77e0751 | Junio C Hamano | 06 April 2016, 18:38:59 UTC | Merge branch 'ss/receive-pack-parse-options' The command line argument parser for "receive-pack" has been rewritten to use parse-options. * ss/receive-pack-parse-options: builtin/receive-pack.c: use parse_options API | 06 April 2016, 18:38:59 UTC |
| 12508a8 | Junio C Hamano | 06 April 2016, 18:38:59 UTC | Merge branch 'ss/exc-flag-is-a-collection-of-bits' Code clean-up. * ss/exc-flag-is-a-collection-of-bits: dir: store EXC_FLAG_* values in unsigned integers | 06 April 2016, 18:38:59 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 |
| d3bfbf9 | Michael J Gruber | 05 April 2016, 10:45:35 UTC | completion: complete --cherry-mark for git log Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2016, 20:53:54 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 |
| 915c96d | Junio C Hamano | 04 April 2016, 23:09:18 UTC | pretty: test --expand-tabs The test prepares a simple commit with HT on its log message lines, and makes sure that - formats that should or should not expand tabs by default do or do not expand tabs respectively, - with explicit --expand-tabs=<N> and short-hands --expand-tabs (equivalent to --expand-tabs=8) and --no-expand-tabs (equivalent to --expand-tabs=0) before or after the explicit --pretty=$fmt, the tabs are expanded (or not expanded) accordingly. The tests use the second line of the log message for formats other than --pretty=short, primarily because the first line of the email format is handled specially to add the [PATCH] prefix, etc. in a separate codepath (--pretty=short uses the first line because there is no other line to test). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2016, 06:31:13 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 |
| b73a1bc | Eric Sunshine | 27 March 2016, 21:26:07 UTC | git-format-patch.txt: don't show -s as shorthand for multiple options git-format-patch recognizes -s as shorthand only for --signoff, however, its documentation shows -s as shorthand for both --signoff and --no-patch. Resolve this confusion by suppressing the bogus -s shorthand for --no-patch. While here, also avoid showing the --no-patch option in git-format-patch documentation since it doesn't make sense to ask to suppress the patch while at the same time explicitly asking to format the patch (which, after all, is the purpose of git-format-patch). Reported-by: Kevin Brodsky <corax26@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2016, 20:46:54 UTC |
| 450dd1d | Mehul Jain | 02 April 2016, 17:58:32 UTC | t5520: test --[no-]autostash with pull.rebase=true The "--[no-]autostash" options for git-pull are only valid in rebase mode (i.e. either --rebase is used or pull.rebase=true). Existing tests already check the cases when --rebase is used but fail to check for pull.rebase=true case. Add two new tests to check that the --[no-]autostash options work with pull.rebase=true. Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2016, 18:15:02 UTC |
| 1662297 | Mehul Jain | 02 April 2016, 17:58:31 UTC | t5520: reduce commom lines of code These two tests are almost similar and thus can be folded in a for-loop. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2016, 18:15:01 UTC |
| 44a59ff | Mehul Jain | 02 April 2016, 17:58:30 UTC | t5520: factor out common "failing autostash" code Three tests contains repetitive lines of code. Factor out common code into test_pull_autostash_fail() and then call it in these tests. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2016, 18:14:58 UTC |
| 5c82bcd | Mehul Jain | 02 April 2016, 17:58:29 UTC | t5520: factor out common "successful autostash" code Four tests contains repetitive lines of code. Factor out common code into test_pull_autostash() and then call it in these tests. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2016, 18:13:54 UTC |
| 6ddc97c | Mehul Jain | 02 April 2016, 17:58:28 UTC | t5520: use better test to check stderr output Checking stderr output using test_i18ncmp may lead to test failure as some shells write trace output to stderr when run under 'set -x'. Use test_i18ngrep instead of test_i18ncmp. Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2016, 18:07:58 UTC |
| eff960b | Mehul Jain | 02 April 2016, 17:58:27 UTC | t5520: ensure consistent test conditions Test title says that tests are done with rebase.autostash unset, but does not take any action to make sure that it is indeed unset. This may lead to test failure if future changes somehow pollutes the configuration globally. Ensure consistent test conditions by explicitly unsetting rebase.autostash. Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2016, 18:07:33 UTC |
| efa195d | Mehul Jain | 02 April 2016, 17:58:26 UTC | t5520: use consistent capitalization in test titles Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2016, 18:07:01 UTC |
| 35d62bb | Jacob Nisnevich | 25 March 2016, 23:17:57 UTC | mergetools: add support for ExamDiff Signed-off-by: Jacob Nisnevich <jacob.nisnevich@gmail.com> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2016, 16:15:14 UTC |
| e36d716 | Jacob Nisnevich | 25 March 2016, 23:17:56 UTC | mergetools: create mergetool_find_win32_cmd() helper function for winmerge Signed-off-by: Jacob Nisnevich <jacob.nisnevich@gmail.com> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2016, 16:15:00 UTC |
| 6a269e5 | Junio C Hamano | 03 April 2016, 17:55:36 UTC | First batch for post 2.8 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2016, 17:55:36 UTC |
| 9494c39 | Junio C Hamano | 03 April 2016, 17:54:38 UTC | Sync with Git 2.8.1 | 03 April 2016, 17:54:38 UTC |
| 05bf1cd | Junio C Hamano | 03 April 2016, 17:29:35 UTC | Merge branch 'jk/startup-info' 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 | 03 April 2016, 17:29:36 UTC |
| 7ce0bee | Junio C Hamano | 03 April 2016, 17:29:35 UTC | Merge branch 'es/test-gpg-tags' A test for tags has been restructured so that more parts of it can easily be run on a platform without a working GnuPG. * es/test-gpg-tags: t6302: skip only signed tags rather than all tests when GPG is missing t6302: also test annotated in addition to signed tags t6302: normalize names and descriptions of signed tags lib-gpg: drop unnecessary "missing GPG" warning | 03 April 2016, 17:29:35 UTC |
| 087f171 | Junio C Hamano | 03 April 2016, 17:29:34 UTC | Merge branch 'jk/getwholeline-getdelim-empty' 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 | 03 April 2016, 17:29:34 UTC |
| aa3a2c2 | Junio C Hamano | 03 April 2016, 17:29:33 UTC | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' 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 | 03 April 2016, 17:29:33 UTC |
| 3583bf5 | Junio C Hamano | 03 April 2016, 17:29:31 UTC | Merge branch 'jc/index-pack' Code clean-up. * jc/index-pack: index-pack: add a helper function to derive .idx/.keep filename | 03 April 2016, 17:29:31 UTC |
| 9081cff | Junio C Hamano | 03 April 2016, 17:29:29 UTC | Merge branch 'gf/fetch-pack-direct-object-fetch' 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 | 03 April 2016, 17:29:29 UTC |
| d4a2230 | Junio C Hamano | 03 April 2016, 17:29:29 UTC | Merge branch 'jc/maint-index-pack-keep' "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work. * jc/maint-index-pack-keep: index-pack: correct --keep[=<msg>] | 03 April 2016, 17:29:29 UTC |
| 3b8c4b7 | Junio C Hamano | 03 April 2016, 17:29:27 UTC | Merge branch 'mm/lockfile-error-message' * mm/lockfile-error-message: lockfile: improve error message when lockfile exists lockfile: mark strings for translation | 03 April 2016, 17:29:27 UTC |
| fbebb5c | Junio C Hamano | 03 April 2016, 17:29:26 UTC | Merge branch 'jk/rev-parse-local-env-vars' 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 | 03 April 2016, 17:29:27 UTC |
| c832cef | Junio C Hamano | 03 April 2016, 17:29:26 UTC | Merge branch 'jk/config-get-urlmatch' "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 | 03 April 2016, 17:29:26 UTC |
| 2052c52 | Junio C Hamano | 03 April 2016, 17:29:25 UTC | Merge branch 'jk/add-i-highlight' * jk/add-i-highlight: add--interactive: allow custom diff highlighting programs | 03 April 2016, 17:29:25 UTC |
