AgeCommit message (Collapse)Author
2017-05-04Merge branch 'rg/a-the-typo'Junio C Hamano
Typofix. * rg/a-the-typo: fix minor typos
2017-05-04Merge branch 'sr/hooks-cwd-doc'Junio C Hamano
* sr/hooks-cwd-doc: githooks.txt: clarify push hooks are always executed in $GIT_DIR
2017-05-04Merge branch 'rg/doc-submittingpatches-wordfix'Junio C Hamano
* rg/doc-submittingpatches-wordfix: doc: update SubmittingPatches
2017-05-04Merge branch 'rg/doc-pull-typofix'Junio C Hamano
* rg/doc-pull-typofix: doc: git-pull.txt use US spelling, fix minor typo
2017-05-04Merge branch 'ja/i18n-cleanup'Junio C Hamano
* ja/i18n-cleanup: i18n: read-cache: typofix i18n: remove i18n from tag reflog message
2017-05-02l10n: fr.po v2.13 round 1Jean-Noel Avila
Signed-off-by: Jean-Noel Avila <>
2017-05-01l10n: pt_PT: update Portuguese translationVasco Almeida
Signed-off-by: Vasco Almeida <>
2017-05-01Merging a handful of topics before -rc2Junio C Hamano
Signed-off-by: Junio C Hamano <>
2017-05-01Merge branch 'sh/rebase-i-reread-todo-after-exec'Junio C Hamano
"git rebase -i" failed to re-read the todo list file when the command specified with the `exec` instruction updated it. * sh/rebase-i-reread-todo-after-exec: rebase -i: reread the todo list if `exec` touched it
2017-05-01Merge branch 'ls/travis-stricter-linux32-builds'Junio C Hamano
32-bit Linux build on Travis CI uses stricter compilation options. * ls/travis-stricter-linux32-builds: travis-ci: set DEVELOPER knob for Linux32 build
2017-05-01Merge branch 'ls/travis-win-fix-status'Junio C Hamano
Relaying status from Windows build by Travis CI was done with an unsafe invocation of printf. * ls/travis-win-fix-status: travis-ci: printf $STATUS as string
2017-05-01Merge branch 'jk/submodule-init-segv-fix'Junio C Hamano
Fix a segv in 'submodule init' when url is not given for a submodule. * jk/submodule-init-segv-fix: submodule_init: die cleanly on submodules without url defined
2017-05-01Merge branch 'jk/prio-queue-avoid-swap-with-self'Junio C Hamano
Code clean-up. * jk/prio-queue-avoid-swap-with-self: prio_queue_reverse: don't swap elements with themselves
2017-05-01Merge branch 'ab/align-perf-descriptions'Junio C Hamano
Output from perf tests have been updated to align their titles. * ab/align-perf-descriptions: t/perf: correctly align non-ASCII descriptions in output
2017-05-01Merge branch 'jk/complete-checkout-sans-dwim-remote'Junio C Hamano
Completion for "git checkout <branch>" that auto-creates the branch out of a remote tracking branch can now be disabled, as this completion often gets in the way when completing to checkout an existing local branch that happens to share the same prefix with bunch of remote tracking branches. * jk/complete-checkout-sans-dwim-remote: completion: optionally disable checkout DWIM
2017-05-01i18n: read-cache: typofixPeter Krefting
Signed-off-by: Peter Krefting <> Signed-off-by: Jean-Noel Avila <> Signed-off-by: Junio C Hamano <>
2017-05-01i18n: remove i18n from tag reflog messageJean-Noel Avila
The building of the reflog message is using strbuf, which is not friendly with internationalization frameworks. No other reflog messages are translated right now and switching all the messages to i18n would require a major rework of the way the messages are built. Signed-off-by: Jean-Noel Avila <> Signed-off-by: Junio C Hamano <>
2017-05-01doc: git-pull.txt use US spelling, fix minor typoRené Genz
Signed-off-by: René Genz <> Signed-off-by: Junio C Hamano <>
2017-05-01fix minor typosRené Genz
Helped-by: Stefan Beller <> Signed-off-by: René Genz <> Signed-off-by: Junio C Hamano <>
2017-05-01githooks.txt: clarify push hooks are always executed in $GIT_DIRSimon Ruderich
Listing the specific hooks might feel verbose but without it the reader is left to wonder which hooks are triggered during the push. Something which is not immediately obvious when only trying to find out where the hook is executed. Signed-off-by: Simon Ruderich <> Reviewed-by: Ævar Arnfjörð Bjarmason <> Signed-off-by: Junio C Hamano <>
2017-05-01doc: update SubmittingPatchesRené Genz
-use US English spelling -minor wording change for better readability Helped-by: Stefan Beller <> Signed-off-by: René Genz <> Signed-off-by: Junio C Hamano <>
2017-04-30l10n: bg.po: Updated Bulgarian translation (3201t)Alexander Shopov
Signed-off-by: Alexander Shopov <>
2017-04-29Merge branch 'master' of Xin
* 'master' of l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0
2017-04-27rebase -i: reread the todo list if `exec` touched itStephen Hicks
In the scripted version of the interactive rebase, there was no internal representation of the todo list; it was re-read before every command. That allowed the hack that an `exec` command could append (or even completely rewrite) the todo list. This hack was broken by the partial conversion of the interactive rebase to C, and this patch reinstates it. We also add a small test to verify that this fix does not regress in the future. Signed-off-by: Stephen Hicks <> Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2017-04-27travis-ci: set DEVELOPER knob for Linux32 buildLars Schneider
The Linux32 build was not build with our strict compiler settings (e.g. warnings as errors). Fix this by passing the DEVELOPER environment variable to the docker container. Signed-off-by: Lars Schneider <> Signed-off-by: Junio C Hamano <>
2017-04-27travis-ci: printf $STATUS as stringLars Schneider
If the $STATUS variable contains a "%" character then printf will interpret that as invalid format string. Fix this by formatting $STATUS as string. Signed-off-by: Lars Schneider <> Acked-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2017-04-27t1450: avoid use of "sed" on the index, which is a binary fileJeff Hostetler
The previous step added a path zzzzzzzz to the index, and then used "sed" to replace this string to yyyyyyyy to create a test case where the checksum at the end of the file does not match the contents. Unfortunately, use of "sed" on a non-text file is not portable. Instead, use a Perl script that seeks to the end and modifies the last byte of the file (where we _know_ stores the trailing checksum). Signed-off-by: Jeff Hostetler <> Signed-off-by: Junio C Hamano <>
2017-04-26Git 2.13-rc1v2.13.0-rc1Junio C Hamano
Signed-off-by: Junio C Hamano <>
2017-04-26Merge branch 'mh/separate-ref-cache'Junio C Hamano
The internals of the refs API around the cached refs has been streamlined. * mh/separate-ref-cache: do_for_each_entry_in_dir(): delete function files_pack_refs(): use reference iteration commit_packed_refs(): use reference iteration cache_ref_iterator_begin(): make function smarter get_loose_ref_cache(): new function get_loose_ref_dir(): function renamed from get_loose_refs() do_for_each_entry_in_dir(): eliminate `offset` argument refs: handle "refs/bisect/" in `loose_fill_ref_dir()` ref-cache: use a callback function to fill the cache refs: record the ref_store in ref_cache, not ref_dir ref-cache: introduce a new type, ref_cache refs: split `ref_cache` code into separate files ref-cache: rename `remove_entry()` to `remove_entry_from_dir()` ref-cache: rename `find_ref()` to `find_ref_entry()` ref-cache: rename `add_ref()` to `add_ref_entry()` refs_verify_refname_available(): use function in more places refs_verify_refname_available(): implement once for all backends refs_ref_iterator_begin(): new function refs_read_raw_ref(): new function get_ref_dir(): don't call read_loose_refs() for "refs/bisect"
2017-04-26Merge branch 'nd/worktree-add-lock'Junio C Hamano
Allow to lock a worktree immediately after it's created. This helps prevent a race between "git worktree add; git worktree lock" and "git worktree prune". * nd/worktree-add-lock: worktree add: add --lock option
2017-04-26Merge branch 'jk/update-links-in-docs'Junio C Hamano
Many stale HTTP(s) links have been updated in our documentation. * jk/update-links-in-docs: docs/bisect-lk2009: update java code conventions link docs/bisect-lk2009: update nist report link docs/archimport: quote reference gitcore-tutorial: update broken link doc: replace gitwiki link with doc: use https links to avoid http redirect
2017-04-26Merge branch 'sf/putty-w-args'Junio C Hamano
Plug a memleak. * sf/putty-w-args: connect.c: fix leak in handle_ssh_variant
2017-04-26Merge branch 'ab/completion-push-delete-ref'Junio C Hamano
The completion script (in contrib/) learned to complete "git push --delete b<TAB>" to complete branch name to be deleted. * ab/completion-push-delete-ref: completion: expand "push --delete <remote> <ref>" for refs on that <remote>
2017-04-26Merge branch 'cc/split-index-config'Junio C Hamano
The split-index code configuration code used an unsafe git_path() function without copying its result out. * cc/split-index-config: read-cache: avoid using git_path() in freshen_shared_index()
2017-04-26Merge branch 'jk/war-on-git-path'Junio C Hamano
While handy, "git_path()" is a dangerous function to use as a callsite that uses it safely one day can be broken by changes to other code that calls it. Reduction of its use continues. * jk/war-on-git-path: am: drop "dir" parameter from am_state_init replace strbuf_addstr(git_path()) with git_path_buf() replace xstrdup(git_path(...)) with git_pathdup(...) use git_path_* helper functions branch: add edit_description() helper bisect: add git_path_bisect_terms helper
2017-04-26Merge branch 'jh/add-index-entry-optim'Junio C Hamano
"git checkout" that handles a lot of paths has been optimized by reducing the number of unnecessary checks of paths in the has_dir_name() function. * jh/add-index-entry-optim: read-cache: speed up has_dir_name (part 2) read-cache: speed up has_dir_name (part 1) read-cache: speed up add_index_entry during checkout p0006-read-tree-checkout: perf test to time read-tree read-cache: add strcmp_offset function
2017-04-26Merge branch 'ss/submodule-shallow-doc'Junio C Hamano
Doc update. * ss/submodule-shallow-doc: gitmodules: clarify what history depth a shallow clone has
2017-04-26Merge branch 'ss/gitmodules-ignore-doc'Junio C Hamano
Doc update. * ss/gitmodules-ignore-doc: gitmodules: clarify the ignore option values
2017-04-26Merge branch 'nd/conditional-config-in-early-config'Junio C Hamano
The recently introduced conditional inclusion of configuration did not work well when early-config mechanism was involved. * nd/conditional-config-in-early-config: config: correct file reading order in read_early_config() config: handle conditional include when $GIT_DIR is not set up config: prepare to pass more info in git_config_with_options()
2017-04-26Merge branch 'ab/push-cas-doc-n-test'Junio C Hamano
Doc update. * ab/push-cas-doc-n-test: push: document & test --force-with-lease with multiple remotes
2017-04-26Merge branch 'ls/travis-coccicheck'Junio C Hamano
Travis CI learns to run coccicheck. * ls/travis-coccicheck: travis-ci: add static analysis build job to run coccicheck
2017-04-26Merge branch 'ps/pathspec-empty-prefix-origin'Junio C Hamano
A recent update broke "git add -p ../foo" from a subdirectory. * ps/pathspec-empty-prefix-origin: pathspec: honor `PATHSPEC_PREFIX_ORIGIN` with empty prefix
2017-04-26Merge branch 'pc/t2027-git-to-pipe-cleanup'Junio C Hamano
Having a git command on the upstream side of a pipe in a test script will hide the exit status from the command, which may cause us to fail to notice a breakage; rewrite tests in a script to avoid this issue. * pc/t2027-git-to-pipe-cleanup: t2027: avoid using pipes
2017-04-26Merge branch 'gb/rebase-signoff'Junio C Hamano
"git rebase" learns "--signoff" option. * gb/rebase-signoff: rebase: pass --[no-]signoff option to git am builtin/am: fold am_signoff() into am_append_signoff() builtin/am: honor --signoff also when --rebasing
2017-04-25l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0Tran Ngoc Quan
Signed-off-by: Tran Ngoc Quan <>
2017-04-25prio_queue_reverse: don't swap elements with themselvesJeff King
Our array-reverse algorithm does the usual "walk from both ends, swapping elements". We can quit when the two indices are equal, since: 1. Swapping an element with itself is a noop. 2. If i and j are equal, then in the next iteration i is guaranteed to be bigge than j, and we will exit the loop. So exiting the loop on equality is slightly more efficient. And more importantly, the new SWAP() macro does not expect to handle noop swaps; it will call memcpy() with the same src and dst pointers in this case. It's unclear whether that causes a problem on any platforms by violating the "overlapping memory" constraint of memcpy, but it does cause valgrind to complain. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2017-04-25submodule_init: die cleanly on submodules without url definedJeff King
When we init a submodule, we try to die when it has no URL defined: url = xstrdup(sub->url); if (!url) die(...); But that's clearly nonsense. xstrdup() will never return NULL, and if sub->url is NULL, we'll segfault. These two bits of code need to be flipped, so we check sub->url before looking at it. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2017-04-24Getting ready for -rc1Junio C Hamano
Signed-off-by: Junio C Hamano <>
2017-04-24Merge branch 'dt/xgethostname-nul-termination'Junio C Hamano
gethostname(2) may not NUL terminate the buffer if hostname does not fit; unfortunately there is no easy way to see if our buffer was too small, but at least this will make sure we will not end up using garbage past the end of the buffer. * dt/xgethostname-nul-termination: xgethostname: handle long hostnames use HOST_NAME_MAX to size buffers for gethostname(2)
2017-04-24Merge branch 'jk/ls-files-recurse-submodules-fix'Junio C Hamano
"ls-files --recurse-submodules" did not quite work well in a project with nested submodules. * jk/ls-files-recurse-submodules-fix: ls-files: fix path used when recursing into submodules ls-files: fix recurse-submodules with nested submodules