| f99a38c | Junio C Hamano | 21 July 2015, 21:11:54 UTC | Git 2.5.0-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2015, 21:11:54 UTC |
| c5918ab | Junio C Hamano | 21 July 2015, 19:45:27 UTC | Merge branch 'tf/gitweb-typofix' * tf/gitweb-typofix: gitweb: fix typo in man page | 21 July 2015, 19:45:27 UTC |
| 83d3330 | Junio C Hamano | 21 July 2015, 17:27:33 UTC | Merge tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-po l10n-2.5.0-rnd2 * tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-po: l10n: ca.po: update translation l10n: de.po: translate 9 new messages l10n: Updated Bulgarian translation of git (2359t,0f,0u) l10n: zh_CN: for git v2.5.0 l10n round 2 l10n: sv.po: Update Swedish translation (2359t0f0u) l10n: fr v2.5.0 round 2 (2359t) l10n: ru.po: update Russian translation l10n: Updated Vietnamese translation (2359t) l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed) | 21 July 2015, 17:27:33 UTC |
| cdab3ca | Alex Henrie | 20 July 2015, 17:54:40 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 20 July 2015, 17:54:40 UTC |
| fbdeabf | Junio C Hamano | 17 July 2015, 17:44:56 UTC | Merge branch 'jk/still-interesting' Code clean-up. * jk/still-interesting: revision.c: remove unneeded check for NULL | 17 July 2015, 17:44:56 UTC |
| 4d9f744 | Junio C Hamano | 17 July 2015, 17:44:54 UTC | Merge branch 'es/worktree-add' Update to the "linked checkout" in 2.5.0-rc1. Instead of "checkout --to" that does not do what "checkout" normally does, move the functionality to "git worktree add". As this makes the end-user experience of the "worktree add" more or less complete, I am tempted to say we should cook the other topic that removes the internal "new-worktree-mode" hack from "checkout" a bit longer in 'next', and release 2.5 final without that one. * es/worktree-add: Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference worktree: caution that this is still experimental Documentation/git-worktree: fix stale "git checkout --to" references | 17 July 2015, 17:44:55 UTC |
| 1eaca7a | Eric Sunshine | 17 July 2015, 00:17:02 UTC | Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference This should have been changed by 93a3649 (Documentation: move linked worktree description from checkout to worktree, 2015-07-06). Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 July 2015, 17:05:36 UTC |
| 18b22db | Junio C Hamano | 16 July 2015, 22:59:48 UTC | worktree: caution that this is still experimental Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 July 2015, 22:59:48 UTC |
| 4d5a3c5 | Eric Sunshine | 16 July 2015, 22:09:43 UTC | Documentation/git-worktree: fix stale "git checkout --to" references These should have been changed to "git worktree add" by fc56361 (worktree: introduce "add" command, 2015-07-06. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 July 2015, 22:59:17 UTC |
| 01d597f | Jiang Xin | 15 July 2015, 23:44:43 UTC | Merge branch 'master' of https://github.com/ralfth/git-po-de * 'master' of https://github.com/ralfth/git-po-de: l10n: de.po: translate 9 new messages | 15 July 2015, 23:44:43 UTC |
| 6003e7f | Junio C Hamano | 15 July 2015, 19:32:37 UTC | Sync with 2.4.6 | 15 July 2015, 19:32:37 UTC |
| bb3e7b1 | Junio C Hamano | 15 July 2015, 18:45:42 UTC | Git 2.4.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 July 2015, 19:31:07 UTC |
| abecdde | Junio C Hamano | 15 July 2015, 19:30:14 UTC | Merge branch 'jc/diff-ws-error-highlight' A hotfix to a new feature in 2.5.0-rc. * jc/diff-ws-error-highlight: diff: parse ws-error-highlight option more strictly | 15 July 2015, 19:30:14 UTC |
| b7abfac | Junio C Hamano | 15 July 2015, 18:41:26 UTC | Merge branch 'mm/describe-doc' into maint Docfix. * mm/describe-doc: Documentation/describe: improve one-line summary | 15 July 2015, 18:41:26 UTC |
| 51d5980 | Junio C Hamano | 15 July 2015, 18:41:26 UTC | Merge branch 'jc/prompt-document-ps1-state-separator' into maint Docfix. * jc/prompt-document-ps1-state-separator: git-prompt.sh: document GIT_PS1_STATESEPARATOR | 15 July 2015, 18:41:26 UTC |
| 3f20927 | Junio C Hamano | 15 July 2015, 18:41:24 UTC | Merge branch 'es/osx-header-pollutes-mask-macro' into maint * es/osx-header-pollutes-mask-macro: ewah: use less generic macro name ewah/bitmap: silence warning about MASK macro redefinition | 15 July 2015, 18:41:24 UTC |
| 71a8af6 | Junio C Hamano | 15 July 2015, 18:41:23 UTC | Merge branch 'es/utf8-stupid-compiler-workaround' into maint A compilation workaround. * es/utf8-stupid-compiler-workaround: utf8: NO_ICONV: silence uninitialized variable warning | 15 July 2015, 18:41:23 UTC |
| a15ebbc | Junio C Hamano | 15 July 2015, 18:41:22 UTC | Merge branch 'fk/doc-format-patch-vn' into maint Docfix. * fk/doc-format-patch-vn: doc: format-patch: fix typo | 15 July 2015, 18:41:22 UTC |
| e9da4e6 | Junio C Hamano | 15 July 2015, 18:41:21 UTC | Merge branch 'pt/t0302-needs-sanity' into maint * pt/t0302-needs-sanity: t0302: "unreadable" test needs SANITY prereq | 15 July 2015, 18:41:21 UTC |
| eca143b | Junio C Hamano | 15 July 2015, 18:41:20 UTC | Merge branch 'me/fetch-into-shallow-safety' into maint "git fetch --depth=<depth>" and "git clone --depth=<depth>" issued a shallow transfer request even to an upload-pack that does not support the capability. * me/fetch-into-shallow-safety: fetch-pack: check for shallow if depth given | 15 July 2015, 18:41:20 UTC |
| 697f67a | Junio C Hamano | 15 July 2015, 18:41:19 UTC | Merge branch 'mh/fsck-reflog-entries' into maint "git fsck" used to ignore missing or invalid objects recorded in reflog. * mh/fsck-reflog-entries: fsck: report errors if reflog entries point at invalid objects fsck_handle_reflog_sha1(): new function | 15 July 2015, 18:41:19 UTC |
| ada9ecd | Junio C Hamano | 15 July 2015, 18:41:18 UTC | Merge branch 'af/tcsh-completion-noclobber' into maint The tcsh completion writes a bash scriptlet but that would have failed for users with noclobber set. * af/tcsh-completion-noclobber: git-completion.tcsh: fix redirect with noclobber | 15 July 2015, 18:41:18 UTC |
| 7c62118 | Junio C Hamano | 15 July 2015, 18:41:17 UTC | Merge branch 'pa/auto-gc-mac-osx' into maint Recent Mac OS X updates breaks the logic to detect that the machine is on the AC power in the sample pre-auto-gc script. * pa/auto-gc-mac-osx: hooks/pre-auto-gc: adjust power checking for newer OS X | 15 July 2015, 18:41:17 UTC |
| 93eba05 | Junio C Hamano | 15 July 2015, 18:41:16 UTC | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint "git format-patch --ignore-if-upstream A..B" did not like to be fed tags as boundary commits. * jc/do-not-feed-tags-to-clear-commit-marks: format-patch: do not feed tags to clear_commit_marks() | 15 July 2015, 18:41:16 UTC |
| f1e80c0 | Ralf Thielow | 14 July 2015, 17:41:07 UTC | l10n: de.po: translate 9 new messages Translate 9 new messages came from git.pot update in a4156d2 (l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com> | 15 July 2015, 18:30:52 UTC |
| 619b8f8 | Alexander Shopov | 14 July 2015, 16:09:55 UTC | l10n: Updated Bulgarian translation of git (2359t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 15 July 2015, 17:34:23 UTC |
| 5bb01d4 | Jiang Xin | 13 July 2015, 23:33:09 UTC | l10n: zh_CN: for git v2.5.0 l10n round 2 Update 9 translations (2359t0f0u) for git v2.5.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 15 July 2015, 15:21:08 UTC |
| e557179 | Peter Krefting | 15 July 2015, 11:54:11 UTC | l10n: sv.po: Update Swedish translation (2359t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 15 July 2015, 11:54:11 UTC |
| 297230d | Jiang Xin | 14 July 2015, 23:06:49 UTC | Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/git * 'fr_v2.5.0-round2' of git://github.com/jnavila/git: l10n: fr v2.5.0 round 2 (2359t) | 14 July 2015, 23:06:49 UTC |
| be67fb4 | Jean-Noel Avila | 14 July 2015, 10:25:06 UTC | l10n: fr v2.5.0 round 2 (2359t) Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 14 July 2015, 21:03:24 UTC |
| 9ce8613 | Jiang Xin | 14 July 2015, 14:30:12 UTC | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru * 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation | 14 July 2015, 14:30:12 UTC |
| a3e55f7 | Dimitriy Ryazantcev | 14 July 2015, 13:34:00 UTC | l10n: ru.po: update Russian translation Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> | 14 July 2015, 13:34:00 UTC |
| 21f6373 | Tran Ngoc Quan | 14 July 2015, 00:30:51 UTC | l10n: Updated Vietnamese translation (2359t) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 14 July 2015, 00:30:51 UTC |
| a4156d2 | Jiang Xin | 13 July 2015, 23:20:08 UTC | l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed) Generate po/git.pot from v2.5.0-rc2 for git v2.5.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 13 July 2015, 23:20:08 UTC |
| 961abca | Junio C Hamano | 13 July 2015, 22:37:24 UTC | Merge tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-po l10n-2.5.0-rnd1 * tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-po: l10n: de.po: translate 65 new messages l10n: de.po: translate "index" as "Index" l10n: de.po: fix translation of "head nodes" l10n: zh_CN: for git v2.5.0 l10n round 1 l10n: ca.po: update translation l10n: fr.po v2.5.0-rc0 (2355t) l10n: Updated Bulgarian translation of git (2355t,0f,0u) l10n: sv.po: Update Swedish translation (2355t0f0u) l10n: Updated Vietnamese translation (2355t) l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed) | 13 July 2015, 22:37:24 UTC |
| 01977f4 | Junio C Hamano | 13 July 2015, 21:03:44 UTC | Git 2.5.0-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 July 2015, 21:04:30 UTC |
| 799767c | Junio C Hamano | 13 July 2015, 21:02:18 UTC | Merge branch 'es/worktree-add' Update to the "linked checkout" in 2.5.0-rc1. Instead of "checkout --to" that does not do what "checkout" normally does, move the functionality to "git worktree add". * es/worktree-add: (24 commits) Revert "checkout: retire --ignore-other-worktrees in favor of --force" checkout: retire --ignore-other-worktrees in favor of --force worktree: add: auto-vivify new branch when <branch> is omitted worktree: add: make -b/-B default to HEAD when <branch> is omitted worktree: extract basename computation to new function checkout: require worktree unconditionally checkout: retire --to option tests: worktree: retrofit "checkout --to" tests for "worktree add" worktree: add -b/-B options worktree: add --detach option worktree: add --force option worktree: introduce "add" command checkout: drop 'checkout_opts' dependency from prepare_linked_checkout checkout: make --to unconditionally verbose checkout: prepare_linked_checkout: drop now-unused 'new' argument checkout: relocate --to's "no branch specified" check checkout: fix bug with --to and relative HEAD Documentation/git-worktree: add EXAMPLES section Documentation/git-worktree: add high-level 'lock' overview Documentation/git-worktree: split technical info from general description ... | 13 July 2015, 21:02:19 UTC |
| 7783eb2 | Junio C Hamano | 13 July 2015, 21:02:02 UTC | Merge branch 'nd/multiple-work-trees' "git checkout [<tree-ish>] <paths>" spent unnecessary cycles checking if the current branch was checked out elsewhere, when we know we are not switching the branches ourselves. * nd/multiple-work-trees: worktree: new place for "git prune --worktrees" checkout: don't check worktrees when not necessary | 13 July 2015, 21:02:02 UTC |
| 721f5bb | Junio C Hamano | 13 July 2015, 21:00:28 UTC | Merge branch 'ss/clone-guess-dir-name-simplify' Code simplification. * ss/clone-guess-dir-name-simplify: clone: simplify string handling in guess_dir_name() | 13 July 2015, 21:00:28 UTC |
| 313f523 | Junio C Hamano | 13 July 2015, 21:00:27 UTC | Merge branch 'kb/config-unmap-before-renaming' "git config" failed to update the configuration file when the underlying filesystem is incapable of renaming a file that is still open. * kb/config-unmap-before-renaming: config.c: fix writing config files on Windows network shares | 13 July 2015, 21:00:27 UTC |
| d790ba9 | Junio C Hamano | 13 July 2015, 21:00:27 UTC | Merge branch 'mh/strbuf-read-file-returns-ssize-t' Avoid possible ssize_t to int truncation. * mh/strbuf-read-file-returns-ssize-t: strbuf: strbuf_read_file() should return ssize_t | 13 July 2015, 21:00:27 UTC |
| 6cf7eef | Junio C Hamano | 13 July 2015, 21:00:26 UTC | Merge branch 'jc/unexport-git-pager-in-use-in-pager' When you say "!<ENTER>" while running say "git log", you'd confuse yourself in the resulting shell, that may look as if you took control back to the original shell you spawned "git log" from but that isn't what is happening. To that new shell, we leaked GIT_PAGER_IN_USE environment variable that was meant as a local communication between the original "Git" and subprocesses that was spawned by it after we launched the pager, which caused many "interesting" things to happen, e.g. "git diff | cat" still paints its output in color by default. Stop leaking that environment variable to the pager's half of the fork; we only need it on "Git" side when we spawn the pager. * jc/unexport-git-pager-in-use-in-pager: pager: do not leak "GIT_PAGER_IN_USE" to the pager | 13 July 2015, 21:00:27 UTC |
| 43f23b0 | Junio C Hamano | 13 July 2015, 21:00:26 UTC | Merge branch 'kb/use-nsec-doc' Clarify in the Makefile a guideline to decide use of USE_NSEC. * kb/use-nsec-doc: Makefile / racy-git.txt: clarify USE_NSEC prerequisites | 13 July 2015, 21:00:26 UTC |
| e01787f | Junio C Hamano | 13 July 2015, 21:00:25 UTC | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' Abandoning an already applied change in "git rebase -i" with "--continue" left CHERRY_PICK_HEAD and confused later steps. * js/rebase-i-clean-up-upon-continue-to-skip: rebase -i: do not leave a CHERRY_PICK_HEAD file behind t3404: demonstrate CHERRY_PICK_HEAD bug | 13 July 2015, 21:00:25 UTC |
| 0e521a4 | Junio C Hamano | 13 July 2015, 21:00:24 UTC | Merge branch 'et/http-proxyauth' We used to ask libCURL to use the most secure authentication method available when talking to an HTTP proxy only when we were told to talk to one via configuration variables. We now ask libCURL to always use the most secure authentication method, because the user can tell libCURL to use an HTTP proxy via an environment variable without using configuration variables. * et/http-proxyauth: http: always use any proxy auth method available | 13 July 2015, 21:00:24 UTC |
| acf7189 | Junio C Hamano | 13 July 2015, 21:00:23 UTC | Merge branch 'jc/fsck-retire-require-eoh' A fix to a minor regression to "git fsck" in v2.2 era that started complaining about a body-less tag object when it lacks a separator empty line after its header to separate it with a non-existent body. * jc/fsck-retire-require-eoh: fsck: it is OK for a tag and a commit to lack the body | 13 July 2015, 21:00:24 UTC |
| 3f4f17b | René Scharfe | 11 July 2015, 12:58:21 UTC | diff: parse ws-error-highlight option more strictly Check if a matched token is followed by a delimiter before advancing the pointer arg. This avoids accepting composite words like "allnew" or "defaultcontext" and misparsing them as "new" or "context". Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 July 2015, 16:55:23 UTC |
| c925fe2 | Junio C Hamano | 12 July 2015, 16:38:21 UTC | Revert "checkout: retire --ignore-other-worktrees in favor of --force" This reverts commit 0d1a1517835a10818f2d40d8780a268dbb5e20ce. When trying to switch to a different branch, that happens to be checked out in another working tree, the user shouldn't have to give up the other safety measures (like protecting the local changes that overlap the difference between the branches) while defeating the "no two checkouts of the same branch" safety. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 July 2015, 16:38:21 UTC |
| e59f6c2 | Junio C Hamano | 10 July 2015, 21:29:00 UTC | The last minute bits of fixes Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 July 2015, 21:29:00 UTC |
| 8413a79 | Junio C Hamano | 10 July 2015, 21:26:16 UTC | Merge branch 'cb/rebase-am-exit-code' "git rebase" did not exit with failure when format-patch it invoked failed for whatever reason. * cb/rebase-am-exit-code: rebase: return non-zero error code if format-patch fails | 10 July 2015, 21:26:16 UTC |
| 1f9e0a5 | Junio C Hamano | 10 July 2015, 21:26:14 UTC | Merge branch 'jk/fix-refresh-utime' Fix a small bug in our use of umask() return value. * jk/fix-refresh-utime: check_and_freshen_file: fix reversed success-check | 10 July 2015, 21:26:15 UTC |
| a745a58 | Junio C Hamano | 10 July 2015, 21:26:13 UTC | Merge branch 'mm/branch-doc-updates' * mm/branch-doc-updates: Documentation/branch: document -M and -D in terms of --force Documentation/branch: document -d --force and -m --force | 10 July 2015, 21:26:13 UTC |
| b3a30f6 | Junio C Hamano | 10 July 2015, 21:26:12 UTC | Merge branch 'ls/hint-rev-list-count' * ls/hint-rev-list-count: rev-list: add --count to usage guide | 10 July 2015, 21:26:13 UTC |
| ace6325 | Junio C Hamano | 10 July 2015, 21:26:12 UTC | Merge branch 'jk/rev-list-no-bitmap-while-pruning' A minor bugfix when pack bitmap is used with "rev-list --count". * jk/rev-list-no-bitmap-while-pruning: rev-list: disable --use-bitmap-index when pruning commits | 10 July 2015, 21:26:12 UTC |
| 3cbb920 | Junio C Hamano | 10 July 2015, 21:17:56 UTC | Merge branch 'cb/subtree-tests-update' Tests update in contrib/subtree. * cb/subtree-tests-update: contrib/subtree: small tidy-up to test contrib/subtree: fix broken &&-chains and revealed test error contrib/subtree: use tabs consitently for indentation in tests | 10 July 2015, 21:17:56 UTC |
| 615eb98 | Junio C Hamano | 10 July 2015, 21:17:55 UTC | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' An ancient test framework enhancement to allow color was not entirely correct; this makes it work even when tput needs to read from the ~/.terminfo under the user's real HOME directory. * rh/test-color-avoid-terminfo-in-original-home: test-lib.sh: fix color support when tput needs ~/.terminfo Revert "test-lib.sh: do tests for color support after changing HOME" | 10 July 2015, 21:17:55 UTC |
| 64fe6fc | Junio C Hamano | 10 July 2015, 21:17:54 UTC | Merge branch 'sb/p5310-and-chain' Code clean-up. * sb/p5310-and-chain: p5310: Fix broken && chain in performance test | 10 July 2015, 21:17:54 UTC |
| e12fc40 | Junio C Hamano | 10 July 2015, 21:17:54 UTC | Merge branch 'tb/checkout-doc' Doc update. * tb/checkout-doc: git-checkout.txt: document "git checkout <pathspec>" better | 10 July 2015, 21:17:54 UTC |
| bbddc51 | Junio C Hamano | 10 July 2015, 21:17:53 UTC | Merge branch 'jk/pretty-encoding-doc' Doc update. * jk/pretty-encoding-doc: docs: clarify that --encoding can produce invalid sequences | 10 July 2015, 21:17:54 UTC |
| 89bf013 | Junio C Hamano | 10 July 2015, 21:17:52 UTC | Merge branch 'nd/dwim-wildcards-as-pathspecs' Test updates to a topic already in 2.5-rc. * nd/dwim-wildcards-as-pathspecs: Add tests for wildcard "path vs ref" disambiguation | 10 July 2015, 21:17:52 UTC |
| c07173f | Junio C Hamano | 09 July 2015, 21:31:43 UTC | Merge branch 'jk/maint-for-each-packed-object' The for_each_packed_object() API function did not iterate over objects in a packfile that hasn't been used yet. * jk/maint-for-each-packed-object: for_each_packed_object: automatically open pack index | 09 July 2015, 21:31:43 UTC |
| 0bf46af | Junio C Hamano | 09 July 2015, 21:31:42 UTC | Merge branch 'jc/fix-alloc-sortbuf-in-index-pack' A hotfix for what is in 2.5-rc but not in 2.4. * jc/fix-alloc-sortbuf-in-index-pack: index-pack: fix allocation of sorted_by_pos array | 09 July 2015, 21:31:42 UTC |
| 7e837c6 | Sebastian Schuberth | 09 July 2015, 18:24:08 UTC | clone: simplify string handling in guess_dir_name() Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 July 2015, 21:21:29 UTC |
| 3096b2e | Jeff King | 08 July 2015, 20:33:52 UTC | check_and_freshen_file: fix reversed success-check When we want to write out a loose object file, we have always first made sure we don't already have the object somewhere. Since 33d4221 (write_sha1_file: freshen existing objects, 2014-10-15), we also update the timestamp on the file, so that a simultaneous prune knows somebody is likely to reference it soon. If our utime() call fails, we treat this the same as not having the object in the first place; the safe thing to do is write out another copy. However, the loose-object check accidentally inverts the utime() check; it returns failure _only_ when the utime() call actually succeeded. Thus it was failing to protect us there, and in the normal case where utime() succeeds, it caused us to pointlessly write out and link the object. This passed our freshening tests, because writing out the new object is certainly _one_ way of updating its utime. So the normal case was inefficient, but not wrong. While we're here, let's also drop a comment in front of the check_and_freshen functions, making a note of their return type (since it is not our usual "0 for success, -1 for error"). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 July 2015, 22:58:28 UTC |
| 60d708b | Clemens Buchacher | 02 July 2015, 09:11:33 UTC | rebase: return non-zero error code if format-patch fails Since e481af06 (rebase: Handle cases where format-patch fails) we notice if format-patch fails and return immediately from git-rebase--am. We save the return value with ret=$?, but then we return $?, which is usually zero in this case. Fix this by returning $ret instead. Cc: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Clemens Buchacher <clemens.buchacher@intel.com> Helped-by: Jorge Nunes <jorge.nunes@intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 July 2015, 22:36:42 UTC |
| 262ea4a | Ralf Thielow | 01 July 2015, 18:07:08 UTC | l10n: de.po: translate 65 new messages Translate 65 new messages came from git.pot update in 64f23b0 (l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 08 July 2015, 17:50:38 UTC |
| 43d2401 | Ralf Thielow | 19 June 2015, 17:50:06 UTC | l10n: de.po: translate "index" as "Index" The term "index" is translated as "Staging-Area" to match a majority of German books and to not confuse Git beginners who don't know about Git's index. "Staging Area" is used in German books as a thing where content can be staged for commit. While the translation is good for those kind of messages, it's bad for messages that mean the Git index as the tree state or the index file, in which case we should translate as "Index". Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 08 July 2015, 17:38:42 UTC |
| 121f7b0 | Ralf Thielow | 05 June 2015, 17:30:35 UTC | l10n: de.po: fix translation of "head nodes" Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com> | 08 July 2015, 17:38:42 UTC |
| 0d1a151 | Eric Sunshine | 06 July 2015, 17:31:00 UTC | checkout: retire --ignore-other-worktrees in favor of --force As a safeguard, checking out a branch already checked out by a different worktree is disallowed. This behavior can be overridden with --ignore-other-worktrees, however, this option is neither obvious nor particularly discoverable. As a common safeguard override, --force is more likely to come to mind. Therefore, overload it to also suppress the check for a branch already checked out elsewhere. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 July 2015, 21:34:46 UTC |
| 1eb07d8 | Eric Sunshine | 06 July 2015, 17:30:59 UTC | worktree: add: auto-vivify new branch when <branch> is omitted As a convenience, when <branch> is omitted from "git worktree <path> <branch>" and neither -b nor -B is used, automatically create a new branch named after <path>, as if "-b $(basename <path>)" was specified. Thus, "git worktree add ../hotfix" creates a new branch named "hotfix" and associates it with new worktree "../hotfix". Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 July 2015, 21:34:32 UTC |
| 0f4af3b | Eric Sunshine | 06 July 2015, 17:30:58 UTC | worktree: add: make -b/-B default to HEAD when <branch> is omitted As a convenience, like "git branch" and "git checkout -b", make "git worktree add -b <newbranch> <path> <branch>" default to HEAD when <branch> is omitted. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:48 UTC |
| f5682b2 | Eric Sunshine | 06 July 2015, 17:30:57 UTC | worktree: extract basename computation to new function A subsequent patch will also need to compute the basename of the new worktree, so factor out this logic into a new function. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:48 UTC |
| 0ca560c | Eric Sunshine | 06 July 2015, 17:30:56 UTC | checkout: require worktree unconditionally In order to allow linked worktree creation via "git checkout --to" from a bare repository, 3473ad0 (checkout: don't require a work tree when checking out into a new one, 2014-11-30) dropped git-checkout's unconditional NEED_WORK_TREE requirement and instead performed worktree setup conditionally based upon presence or absence of the --to option. Now that --to has been retired and git-checkout is no longer responsible for linked worktree creation, the NEED_WORK_TREE requirement can be re-instated. This effectively reverts 3473ad0, except for the tests it added which now check bare repository behavior of "git worktree add" instead. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:48 UTC |
| b979d95 | Eric Sunshine | 06 July 2015, 17:30:55 UTC | checkout: retire --to option Now that "git worktree add" has achieved user-facing feature-parity with "git checkout --to", retire the latter. Move the actual linked worktree creation functionality, prepare_linked_checkout() and its helpers, verbatim from checkout.c to worktree.c. This effectively reverts changes to checkout.c by 529fef2 (checkout: support checking out into a new working directory, 2014-11-30) with the exception of merge_working_tree() and switch_branches() which still require specialized knowledge that a the checkout is occurring in a newly-created linked worktree (signaled to them by the private GIT_CHECKOUT_NEW_WORKTREE environment variable). Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:47 UTC |
| f194b1e | Eric Sunshine | 06 July 2015, 17:30:54 UTC | tests: worktree: retrofit "checkout --to" tests for "worktree add" With the introduction of "git worktree add", "git checkout --to" is slated for removal. Therefore, retrofit linked worktree creation tests to use "git worktree add" instead. (The test to check exclusivity of "checkout --to" and "checkout <paths>" is dropped altogether since it becomes meaningless with retirement of "checkout --to".) Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:47 UTC |
| cbdf60f | Eric Sunshine | 06 July 2015, 17:30:53 UTC | worktree: add -b/-B options One of git-worktree's roles is to populate the new worktree, much like git-checkout, and thus, for convenience, ought to support several of the same shortcuts. Toward this goal, add -b/-B options to create a new branch and check it out in the new worktree. (For brevity, only -b is mentioned in the synopsis; -B is omitted.) Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:47 UTC |
| 39ecb27 | Eric Sunshine | 06 July 2015, 17:30:52 UTC | worktree: add --detach option One of git-worktree's roles is to populate the new worktree, much like git-checkout, and thus, for convenience, ought to support several of the same shortcuts. Toward this goal, add a --detach option to detach HEAD in the new worktree. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:46 UTC |
| f432544 | Eric Sunshine | 06 July 2015, 17:30:51 UTC | worktree: add --force option By default, "git worktree add" refuses to create a new worktree when the requested branch is already checked out elsewhere. Add a --force option to override this safeguard. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:46 UTC |
| fc56361 | Eric Sunshine | 06 July 2015, 17:30:50 UTC | worktree: introduce "add" command The plan is to relocate "git checkout --to" functionality to "git worktree add". As a first step, introduce a bare-bones git-worktree "add" command along with documentation. At this stage, "git worktree add" merely invokes "git checkout --to" behind the scenes, but an upcoming patch will move the actual functionality (checkout.c:prepare_linked_checkout() and its helpers) to worktree.c. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:45 UTC |
| bdf0f37 | Eric Sunshine | 06 July 2015, 17:30:49 UTC | checkout: drop 'checkout_opts' dependency from prepare_linked_checkout The plan is to relocate "git checkout --to" functionality to "git worktree add", however, worktree.c won't have access to the 'struct checkout_opts' passed to prepare_linked_worktree(), which it consults for the pathname of the new worktree and the argv[] of the command it should run to populate the new worktree. Facilitate relocation of prepare_linked_worktree() by instead having it accept the pathname and argv[] directly, thus eliminating the final references to 'struct checkout_opts'. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:45 UTC |
| 338dfd0 | Eric Sunshine | 06 July 2015, 17:30:48 UTC | checkout: make --to unconditionally verbose prepare_linked_checkout() respects git-checkout's --quiet flag, however, the plan is to relocate "git checkout --to" functionality to "git worktree add", and git-worktree does not (yet) have a --quiet flag. Consequently, make prepare_linked_checkout() unconditionally verbose to ease eventual code movement to worktree.c. (A --quiet flag can be added to git-worktree later if there is demand for it.) Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:45 UTC |
| 3c3e7f5 | Eric Sunshine | 06 July 2015, 17:30:47 UTC | checkout: prepare_linked_checkout: drop now-unused 'new' argument The only references to 'new' were folded out by the last two patches. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:44 UTC |
| 9559ce8 | Eric Sunshine | 06 July 2015, 17:30:46 UTC | checkout: relocate --to's "no branch specified" check The plan is to relocate "git checkout --to" functionality to "git worktree add", however, this check expects a 'struct branch_info' which git-worktree won't have at hand. It will, however, have access to its own command-line from which it can pick up the branch name. Therefore, as a preparatory step, rather than having prepare_linked_checkout() perform this check, make it the caller's responsibility. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:44 UTC |
| c990a4c | Eric Sunshine | 06 July 2015, 17:30:45 UTC | checkout: fix bug with --to and relative HEAD Given "git checkout --to <path> HEAD~1", the new worktree's HEAD should begin life at the current branch's HEAD~1, however, it actually ends up at HEAD~2. This happens because: 1. git-checkout resolves HEAD~1 2. to satisfy is_git_directory(), prepare_linked_worktree() creates a HEAD for the new worktree with the value of the resolved HEAD~1 3. git-checkout re-invokes itself with the same arguments within the new worktree to populate the worktree 4. the sub git-checkout resolves HEAD~1 relative to its own HEAD, which is the resolved HEAD~1 from the original invocation, resulting unexpectedly and incorrectly in HEAD~2 (relative to the original) Fix this by unconditionally assigning the current worktree's HEAD as the value of the new worktree's HEAD. As a side-effect, this change also eliminates a dependence within prepare_linked_checkout() upon 'struct branch_info'. The plan is to eventually relocate "git checkout --to" functionality to "git worktree add", and worktree.c won't have knowledge of 'struct branch_info', so removal of this dependency is a step toward that goal. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:44 UTC |
| 9645459 | Eric Sunshine | 06 July 2015, 17:30:44 UTC | Documentation/git-worktree: add EXAMPLES section Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:44 UTC |
| a8ba5dd | Eric Sunshine | 06 July 2015, 17:30:43 UTC | Documentation/git-worktree: add high-level 'lock' overview Due to the (current) absence of a "git worktree lock" command, locking a worktree's administrative files to prevent automatic pruning is a manual task, necessarily requiring low-level understanding of linked worktree functionality. However, this level of detail does not belong in the high-level DESCRIPTION section, so add a generalized discussion of locking to DESCRIPTION and move the technical information to DETAILS. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:43 UTC |
| af189b4 | Eric Sunshine | 06 July 2015, 17:30:42 UTC | Documentation/git-worktree: split technical info from general description The DESCRIPTION section should provide a high-level overview of linked worktree functionality to bring users up to speed quickly, without overloading them with low-level details, so relocate the technical information to a new DETAILS section. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:43 UTC |
| 6d3824c | Eric Sunshine | 06 July 2015, 17:30:41 UTC | Documentation/git-worktree: add BUGS section Relocate submodule warning to BUGS and enumerate missing commands. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:43 UTC |
| 93a3649 | Eric Sunshine | 06 July 2015, 17:30:40 UTC | Documentation: move linked worktree description from checkout to worktree Now that the git-worktree command exists, its documentation page is the natural place for the linked worktree description to reside. Relocate the "MULTIPLE WORKING TREES" description verbatim from git-checkout.txt to git-worktree.txt. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:43 UTC |
| 4f09825 | Eric Sunshine | 06 July 2015, 17:30:39 UTC | Documentation/git-worktree: associate options with commands git-worktree options affect some worktree commands but not others, but this is not necessarily obvious from the option descriptions. Make this clear by indicating explicitly which commands are affected by which options. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:43 UTC |
| 5c31464 | Eric Sunshine | 06 July 2015, 17:30:38 UTC | Documentation/git-checkout: fix incorrect worktree prune command This was missed when "git prune --worktrees" became "git worktree prune". Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 18:07:42 UTC |
| 83fe167 | Matthieu Moy | 02 July 2015, 14:07:21 UTC | Documentation/branch: document -M and -D in terms of --force Now that we have proper documentation for --force's interaction with -d and -m, we can avoid duplication and consider -M and -D as convenience aliases for -m --force and -d --force. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 17:36:54 UTC |
| 8482d04 | Matthieu Moy | 02 July 2015, 14:07:20 UTC | Documentation/branch: document -d --force and -m --force The --force option was modified in 356e91f (branch: allow -f with -m and -d, 2014-12-08), but the documentation was not updated. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 17:36:51 UTC |
| 5bdb7a7 | Matthieu Moy | 05 July 2015, 11:10:17 UTC | git-multimail: update to release 1.1.1 The only change is a bugfix: the SMTP mailer was not working with Python 2.4. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2015, 16:43:17 UTC |
| 7aea43f | Jiang Xin | 31 May 2015, 00:42:31 UTC | l10n: zh_CN: for git v2.5.0 l10n round 1 Update 65 translations (2355t0f0u) for git v2.5.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 05 July 2015, 15:13:37 UTC |
| 781d930 | Junio C Hamano | 03 July 2015, 16:51:57 UTC | index-pack: fix allocation of sorted_by_pos array When c6458e60 (index-pack: kill union delta_base to save memory, 2015-04-18) attempted to reduce the memory footprint of index-pack, one of the key thing it did was to keep track of ref-deltas and ofs-deltas separately. In fix_unresolved_deltas(), however it forgot that it now wants to look only at ref deltas in one place. The code allocated an array for nr_unresolved, which is sum of number of ref- and ofs-deltas minus nr_resolved, which may be larger or smaller than the number ref-deltas. Depending on nr_resolved, this was either under or over allocating. Also, the old code before this change had to use 'i' and 'n' because some of the things we see in the (old) deltas[] array we scanned with 'i' would not make it into the sorted_by_pos[] array in the old world order, but now because you have only ref delta in a separate ref_deltas[] array, they increment lock&step. We no longer need separate variables. And most importantly, we shouldn't pass the nr_unresolved parameter, as this number does not play a role in the working of this helper function. Helped-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 July 2015, 22:26:03 UTC |
| 6c8afe4 | Michael Haggerty | 03 July 2015, 13:59:32 UTC | strbuf: strbuf_read_file() should return ssize_t It is currently declared to return int, which could overflow for large files. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 July 2015, 01:25:02 UTC |
| 124b519 | Junio C Hamano | 03 July 2015, 17:18:45 UTC | pager: do not leak "GIT_PAGER_IN_USE" to the pager Since 2e6c012e (setup_pager: set GIT_PAGER_IN_USE, 2011-08-17), we export GIT_PAGER_IN_USE so that a process that becomes the upstream of the spawned pager can still tell that we have spawned the pager and decide to do colored output even when its output no longer goes to a terminal (i.e. isatty(1)). But we forgot to clear it from the enviornment of the spawned pager. This is not a problem in a sane world, but if you have a handful of thousands Git users in your organization, somebody is bound to do strange things, e.g. typing "!<ENTER>" instead of 'q' to get control back from $LESS. GIT_PAGER_IN_USE is still set in that subshell spawned by "less", and all sorts of interesting things starts happening, e.g. "git diff | cat" starts coloring its output. We can clear the environment variable in the half of the fork that runs the pager to avoid the confusion. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 July 2015, 01:07:21 UTC |
| 7363e66 | Alex Henrie | 02 July 2015, 04:22:02 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 02 July 2015, 04:22:02 UTC |
| 1976f9b | Jiang Xin | 01 July 2015, 23:01:51 UTC | Merge branch 'fr_2.5.0_round1' of git://github.com/jnavila/git * 'fr_2.5.0_round1' of git://github.com/jnavila/git: l10n: fr.po v2.5.0-rc0 (2355t) | 01 July 2015, 23:01:51 UTC |
