| 564705c | Junio C Hamano | 22 April 2015, 20:52:43 UTC | Git 2.4.0-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2015, 20:52:43 UTC |
| fb89636 | Junio C Hamano | 21 April 2015, 19:58:50 UTC | Sync with maint | 21 April 2015, 19:58:50 UTC |
| ba63bfa | Junio C Hamano | 21 April 2015, 19:17:09 UTC | Git 2.3.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 April 2015, 19:17:09 UTC |
| d544696 | Junio C Hamano | 21 April 2015, 19:12:25 UTC | Merge branch 'jk/colors' into maint "diff-highlight" (in contrib/) used to show byte-by-byte differences, which meant that multi-byte characters can be chopped in the middle. It learned to pay attention to character boundaries (assuming the UTF-8 payload). * jk/colors: diff-highlight: do not split multibyte characters | 21 April 2015, 19:12:25 UTC |
| d3115a3 | Junio C Hamano | 21 April 2015, 19:12:24 UTC | Merge branch 'jk/test-annoyances' into maint Test fixes. * jk/test-annoyances: t5551: make EXPENSIVE test cheaper t5541: move run_with_cmdline_limit to test-lib.sh t: pass GIT_TRACE through Apache t: redirect stderr GIT_TRACE to descriptor 4 t: translate SIGINT to an exit | 21 April 2015, 19:12:24 UTC |
| 42b2f89 | Junio C Hamano | 21 April 2015, 19:12:23 UTC | Merge branch 'pt/enter-repo-comment-fix' into maint Documentation update. * pt/enter-repo-comment-fix: enter_repo(): fix docs to match code | 21 April 2015, 19:12:23 UTC |
| 1c30f8e | Junio C Hamano | 21 April 2015, 19:12:22 UTC | Merge branch 'jz/gitweb-conf-doc-fix' into maint Documentation update. * jz/gitweb-conf-doc-fix: gitweb.conf.txt: say "build-time", not "built-time" | 21 April 2015, 19:12:22 UTC |
| c809f42 | Junio C Hamano | 21 April 2015, 19:12:21 UTC | Merge branch 'jk/cherry-pick-docfix' into maint * jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits | 21 April 2015, 19:12:21 UTC |
| c84364a | Junio C Hamano | 21 April 2015, 19:12:20 UTC | Merge branch 'iu/fix-parse-options-h-comment' into maint * iu/fix-parse-options-h-comment: parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval | 21 April 2015, 19:12:20 UTC |
| e8281f0 | Junio C Hamano | 21 April 2015, 19:12:19 UTC | Merge branch 'jg/cguide-we-cannot-count' into maint * jg/cguide-we-cannot-count: CodingGuidelines: update 'rough' rule count | 21 April 2015, 19:12:19 UTC |
| 2e0aabe | Junio C Hamano | 21 April 2015, 19:12:18 UTC | Merge branch 'jk/pack-corruption-post-mortem' into maint Documentation update. * jk/pack-corruption-post-mortem: howto: document more tools for recovery corruption | 21 April 2015, 19:12:18 UTC |
| e9ab76d | Junio C Hamano | 21 April 2015, 19:12:17 UTC | Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint Documentation update. * jn/doc-fast-import-no-16-octopus-limit: fast-import doc: remove suggested 16-parent limit | 21 April 2015, 19:12:17 UTC |
| ef05a39 | Junio C Hamano | 21 April 2015, 18:09:19 UTC | RelNotes: "merge --quiet" change has been reverted Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 April 2015, 18:09:19 UTC |
| 7c597ef | Junio C Hamano | 20 April 2015, 22:30:13 UTC | Hopefully the last batch for 2.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2015, 22:30:13 UTC |
| 7ff1402 | Junio C Hamano | 20 April 2015, 22:28:34 UTC | Merge branch 'ps/grep-help-all-callback-arg' Code clean-up. * ps/grep-help-all-callback-arg: grep: correctly initialize help-all option | 20 April 2015, 22:28:34 UTC |
| 9718c7c | Junio C Hamano | 20 April 2015, 22:28:33 UTC | Merge branch 'tb/connect-ipv6-parse-fix' An earlier update to the parser that disects an address broke an address, followed by a colon, followed by an empty string (instead of the port number). * tb/connect-ipv6-parse-fix: connect.c: ignore extra colon after hostname | 20 April 2015, 22:28:33 UTC |
| a59ac46 | Junio C Hamano | 20 April 2015, 22:28:32 UTC | Merge branch 'va/fix-git-p4-tests' Test fixes for git-p4. * va/fix-git-p4-tests: t9814: guarantee only one source exists in git-p4 copy tests git-p4: fix copy detection test t9814: fix broken shell syntax in git-p4 rename test | 20 April 2015, 22:28:32 UTC |
| 268d5bc | Junio C Hamano | 20 April 2015, 22:28:31 UTC | Merge branch 'jc/push-cert' The "git push --signed" protocol extension did not limit what the "nonce" that is a server-chosen string can contain or how long it can be, which was unnecessarily lax. Limit both the length and the alphabet to a reasonably small space that can still have enough entropy. * jc/push-cert: push --signed: tighten what the receiving end can ask to sign | 20 April 2015, 22:28:31 UTC |
| 6b1258b | Junio C Hamano | 20 April 2015, 22:28:29 UTC | Merge branch 'ma/bash-completion-leaking-x' The completion script (in contrib/) contaminated global namespace and clobbered on a shell variable $x. * ma/bash-completion-leaking-x: completion: fix global bash variable leak on __gitcompappend | 20 April 2015, 22:28:30 UTC |
| 1eb0545 | Junio C Hamano | 19 April 2015, 01:35:48 UTC | Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui git-gui 0.20.0 * tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui: git-gui: set version 0.20 git-gui: sv.po: Update Swedish translation (547t0f0u) git-gui i18n: Updated Bulgarian translation (547t,0f,0u) git-gui: Makes chooser set 'gitdir' to the resolved path git-gui: Fixes chooser not accepting gitfiles git-gui: reinstate support for Tcl 8.4 git-gui: fix problem with gui.maxfilesdisplayed git-gui: fix verbose loading when git path contains spaces. git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows git-gui: add configurable tab size to the diff view git-gui: Make git-gui lib dir configurable at runime git-gui i18n: Updated Bulgarian translation (520t,0f,0u) L10n: vi.po (543t): Init translation for Vietnamese git-gui: align the new recursive checkbox with the radiobuttons. git-gui: Add a 'recursive' checkbox in the clone menu. | 19 April 2015, 01:35:48 UTC |
| 4498b3a | Pat Thoyts | 18 April 2015, 11:15:32 UTC | git-gui: set version 0.20 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 April 2015, 11:15:32 UTC |
| 5a5c11f | Peter Krefting | 27 March 2015, 09:25:32 UTC | git-gui: sv.po: Update Swedish translation (547t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 April 2015, 11:03:50 UTC |
| de18648 | Alexander Shopov | 07 April 2015, 15:29:46 UTC | git-gui i18n: Updated Bulgarian translation (547t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 April 2015, 10:51:39 UTC |
| 3d6bc9a | Junio C Hamano | 16 April 2015, 15:03:14 UTC | Revert "merge: pass verbosity flag down to merge-recursive" This reverts commit 2bf15a3330a26183adc8563dbeeacc11294b8a01, whose intention was good, but the verbosity levels used in merge-recursive turns out to be rather uneven. For example, a merge of two branches with conflicting submodule updates used to report CONFLICT: output with --quiet but no longer (which *is* desired), while the final "Automatic merge failed; fix conflicts and then commit" message is still shown even with --quiet (which *is* inconsistent). Originally reported by Bryan Turner; it is too early to declare what the concensus is, but it seems that we would need to level the verbosity levels used in merge strategy backends before we can go forward. In the meantime, we'd revert to the old behaviour until that happens. cf. $gmane/267245 | 16 April 2015, 15:03:14 UTC |
| e46fe3d | Junio C Hamano | 14 April 2015, 18:57:13 UTC | Git 2.4.0-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2015, 18:57:13 UTC |
| 7a1aa0c | Junio C Hamano | 14 April 2015, 18:49:13 UTC | Merge branch 'jk/colors' "diff-highlight" (in contrib/) used to show byte-by-byte differences, which meant that multi-byte characters can be chopped in the middle. It learned to pay attention to character boundaries (assuming the UTF-8 payload). * jk/colors: diff-highlight: do not split multibyte characters | 14 April 2015, 18:49:13 UTC |
| 3cdff83 | Junio C Hamano | 14 April 2015, 18:49:12 UTC | Merge branch 'jk/merge-quiet' "git merge --quiet" did not squelch messages from the underlying merge-recursive strategy. * jk/merge-quiet: merge: pass verbosity flag down to merge-recursive | 14 April 2015, 18:49:12 UTC |
| f8e593e | Junio C Hamano | 14 April 2015, 18:49:11 UTC | Merge branch 'jk/pack-corruption-post-mortem' Documentation update. * jk/pack-corruption-post-mortem: howto: document more tools for recovery corruption | 14 April 2015, 18:49:11 UTC |
| fa9aaa8 | Junio C Hamano | 14 April 2015, 18:49:10 UTC | Merge branch 'jc/update-instead-into-void' A push into an unborn branch, with "receive.denyCurrentBranch" set to "updateInstead", did not check out the working tree as expected. * jc/update-instead-into-void: push-to-deploy: allow pushing into an unborn branch and updating it | 14 April 2015, 18:49:10 UTC |
| d2ae751 | Junio C Hamano | 14 April 2015, 18:49:09 UTC | Merge branch 'sb/plug-streaming-leak' * sb/plug-streaming-leak: streaming.c: fix a memleak | 14 April 2015, 18:49:09 UTC |
| 0cb7054 | Junio C Hamano | 14 April 2015, 18:49:08 UTC | Merge branch 'jn/doc-fast-import-no-16-octopus-limit' Documentation update. * jn/doc-fast-import-no-16-octopus-limit: fast-import doc: remove suggested 16-parent limit | 14 April 2015, 18:49:08 UTC |
| 011cb58 | Junio C Hamano | 14 April 2015, 18:49:07 UTC | Merge branch 'sb/plug-wt-shortstatus-tracking-leak' * sb/plug-wt-shortstatus-tracking-leak: wt-status.c: fix a memleak | 14 April 2015, 18:49:07 UTC |
| bf2cfca | Junio C Hamano | 14 April 2015, 17:34:05 UTC | Merge branch 'pt/enter-repo-comment-fix' * pt/enter-repo-comment-fix: enter_repo(): fix docs to match code | 14 April 2015, 17:34:05 UTC |
| 03571fd | Junio C Hamano | 14 April 2015, 17:34:01 UTC | Merge branch 'jz/gitweb-conf-doc-fix' * jz/gitweb-conf-doc-fix: gitweb.conf.txt: say "build-time", not "built-time" | 14 April 2015, 17:34:01 UTC |
| 5a69705 | Junio C Hamano | 14 April 2015, 17:33:54 UTC | Merge branch 'jk/cherry-pick-docfix' * jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits | 14 April 2015, 17:33:55 UTC |
| 1d058dc | Junio C Hamano | 14 April 2015, 17:33:45 UTC | Merge branch 'iu/fix-parse-options-h-comment' * iu/fix-parse-options-h-comment: parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval | 14 April 2015, 17:33:46 UTC |
| 638cbf5 | Junio C Hamano | 14 April 2015, 16:55:29 UTC | Merge branch 'jg/cguide-we-cannot-count' * jg/cguide-we-cannot-count: CodingGuidelines: update 'rough' rule count | 14 April 2015, 16:55:29 UTC |
| 6c3b2af | Julian Gindi | 13 April 2015, 12:54:14 UTC | CodingGuidelines: update 'rough' rule count Changed inaccurate count of "rough rules" from three to the more generic 'a few'. Signed-off-by: Julian Gindi <juliangindi@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2015, 16:50:31 UTC |
| 5dcd1b1 | Patrick Steinhardt | 09 April 2015, 19:59:06 UTC | grep: correctly initialize help-all option The "help-all" option is being initialized with a wrong value. While being semantically wrong this can also cause a segmentation fault in gcc on ARMv7 hardfloat platforms with a hardened toolchain. Fix this by initializing with a NULL value. Signed-off-by: Patrick Steinhardt <ps@pks.im> Reviewed-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2015, 05:46:28 UTC |
| 852ff1c | Márcio Almada | 08 April 2015, 05:45:58 UTC | completion: fix global bash variable leak on __gitcompappend Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2015, 05:35:51 UTC |
| f1f4c84 | Vitor Antunes | 05 April 2015, 23:08:35 UTC | t9814: guarantee only one source exists in git-p4 copy tests By using a tree with multiple identical files and allowing copy detection to choose any one of them, the check in the test is unnecessarily complex. We can simplify by: * Modify source file (file2) before copying the file. * Check that only file2 is the source in the output of "p4 filelog". * Remove all "case" statements and replace them with simple tests to check that source is "file2". Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2015, 03:25:17 UTC |
| ecc46a1 | Junio C Hamano | 09 April 2015, 04:15:33 UTC | Merge tag 'l10n-2.4.0-rnd2' of git://github.com/git-l10n/git-po git l10n 2.4.0-rnd2 | 09 April 2015, 04:15:47 UTC |
| 6b6c5f7 | Torsten Bögershausen | 07 April 2015, 20:03:25 UTC | connect.c: ignore extra colon after hostname Ignore an extra ':' at the end of the hostname in URL's like "ssh://example.com:/path/to/repo" The colon is meant to separate a port number from the hostname. If the port is empty, the colon should be ignored, see RFC 3986. It had been working for URLs with ssh:// scheme, but was unintentionally broken in 86ceb3, "allow ssh://user@[2001:db8::1]/repo.git" Reported-by: Reid Woodbury Jr. <reidw@rawsound.com> Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2015, 04:00:53 UTC |
| 44cc742 | Jiang Xin | 09 April 2015, 00:21:39 UTC | Merge branch 'master' of git://github.com/alexhenrie/git-po * 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation | 09 April 2015, 00:21:39 UTC |
| 689664a | Jiang Xin | 09 April 2015, 00:00:10 UTC | l10n: TEAMS: Change repository URL of zh_CN Repository URL of zh_CN l10n for Git has been changed over 2 years, update po/TEAMS for it. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 09 April 2015, 00:20:32 UTC |
| c888305 | Alex Henrie | 08 April 2015, 00:07:47 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 08 April 2015, 00:07:47 UTC |
| f88c113 | Alexander Shopov | 07 April 2015, 08:22:47 UTC | l10n: Updated Bulgarian translation of git (2305t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 07 April 2015, 08:23:18 UTC |
| 9386878 | Peter Krefting | 07 April 2015, 07:45:20 UTC | l10n: sv.po: Update Swedish translation (2305t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 07 April 2015, 07:45:20 UTC |
| ddc7d46 | Ralf Thielow | 04 April 2015, 08:06:42 UTC | l10n: de.po: translate one message Translate one message came from git.pot update in 6eebb35 (l10n: git.pot: v2.4.0 round 2 (1 update)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 05 April 2015, 17:10:29 UTC |
| 8d00662 | Kyle J. McKay | 03 April 2015, 22:15:14 UTC | diff-highlight: do not split multibyte characters When the input is UTF-8 and Perl is operating on bytes instead of characters, a diff that changes one multibyte character to another that shares an initial byte sequence will result in a broken diff display as the common byte sequence prefix will be separated from the rest of the bytes in the multibyte character. For example, if a single line contains only the unicode character U+C9C4 (encoded as UTF-8 0xEC, 0xA7, 0x84) and that line is then changed to the unicode character U+C9C0 (encoded as UTF-8 0xEC, 0xA7, 0x80), when operating on bytes diff-highlight will show only the single byte change from 0x84 to 0x80 thus creating invalid UTF-8 and a broken diff display. Fix this by putting Perl into character mode when splitting the line and then back into byte mode after the split is finished. The utf8::xxx functions require Perl 5.8 so we require that as well. Also, since we are mucking with code in the split_line function, we change a '*' quantifier to a '+' quantifier when matching the $COLOR expression which has the side effect of speeding everything up while eliminating useless '' elements in the returned array. Reported-by: Yi EungJun <semtlenori@gmail.com> Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2015, 20:03:45 UTC |
| fa54b52 | Jean-Noel Avila | 04 April 2015, 16:04:56 UTC | l10n: fr.po v2.4.0 round 2 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 04 April 2015, 16:04:56 UTC |
| 9af95af | Dimitriy Ryazantcev | 03 April 2015, 13:30:14 UTC | l10n: ru: updated Russian translation Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> | 03 April 2015, 13:30:14 UTC |
| a4acd09 | Tran Ngoc Quan | 03 April 2015, 01:54:35 UTC | l10n: vi.po(2305t): Updated 1 new string Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 03 April 2015, 01:55:06 UTC |
| 44f518e | Jiang Xin | 03 April 2015, 00:39:57 UTC | l10n: zh_CN: for git v2.4.0 l10n round 2 Translate 1 update message (2305t0f0u) for git v2.4.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 03 April 2015, 00:39:57 UTC |
| 6eebb35 | Jiang Xin | 03 April 2015, 00:16:53 UTC | l10n: git.pot: v2.4.0 round 2 (1 update) Generate po/git.pot from v2.4.0-rc1 for git v2.4.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 03 April 2015, 00:16:53 UTC |
| bfcfc7d | Jiang Xin | 03 April 2015, 00:13:24 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung' l10n: de.po: translate 99 new messages l10n: de.po: fix messages with abbreviated hashs l10n: de.po: add space before ellipsis l10n: vi.po: Updated Vietnamese translation l10n: zh_CN: translations for git v2.4.0-rc0 l10n: fr.po v2.4.0-rc0 round 1 l10n: ca.po: update translation l10n: ru: updated Russian translation l10n: sv.po: Update Swedish translation (2305t0f0u) l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed) l10n: ru: added Russian translation l10n: de.po: fix negation for commit -a with paths | 03 April 2015, 00:13:24 UTC |
| 2bf15a3 | Jeff King | 02 April 2015, 21:39:52 UTC | merge: pass verbosity flag down to merge-recursive This makes "git merge --quiet" really quiet when we call into merge-recursive. Note that we can't just pass our flag down as-is; the two parts of the code use different scales. We center at "0" as normal for git-merge (with "--quiet" giving a negative value), but merge-recursive uses "2" as its center. This patch passes a negative value to merge-recursive rather than "1", though, as otherwise the user would have to use "-qqq" to squelch all messages (but the downside is that the user cannot distinguish between levels 0-2 if without resorting to the GIT_MERGE_VERBOSITY variable). We may want to review and renormalize the message severities in merge-recursive, but that does not have to happen now. This is at least in improvement in the sense that we are respecting "--quiet" at all. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2015, 22:12:39 UTC |
| 6ae0d97 | Junio C Hamano | 02 April 2015, 19:46:06 UTC | Git 2.4.0-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2015, 19:46:06 UTC |
| 3c6151d | Junio C Hamano | 02 April 2015, 19:34:43 UTC | Merge branch 'sb/atomic-push' * sb/atomic-push: send-pack: unify error messages for unsupported capabilities | 02 April 2015, 19:34:43 UTC |
| afcb6ee | Junio C Hamano | 02 April 2015, 01:00:36 UTC | push --signed: tighten what the receiving end can ask to sign Instead of blindly trusting the receiving side to give us a sensible nonce to sign, limit the length (max 256 bytes) and the alphabet (alnum and a few selected punctuations, enough to encode in base64) that can be used in nonce. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2015, 18:05:18 UTC |
| c8b8f22 | Ralf Thielow | 02 April 2015, 17:28:48 UTC | send-pack: unify error messages for unsupported capabilities If --signed is not supported, the error message names the remote "receiving end". If --atomic is not supported, the error message names the remote "server". Unify the naming to "receiving end" as we're in the context of "push". Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2015, 18:02:52 UTC |
| 918de75 | Matthias Rüster | 29 March 2015, 01:46:32 UTC | l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung' The use of 'symbolische Verknüpfung' for 'symbolic link' is more common than 'symbolischer Verweis'. Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 02 April 2015, 16:35:33 UTC |
| 668fa6c | Ralf Thielow | 27 March 2015, 15:58:26 UTC | l10n: de.po: translate 99 new messages Translate 99 messages came from git.pot update in c2ea120 (l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 02 April 2015, 16:35:28 UTC |
| 1c8f034 | Ralf Thielow | 24 March 2015, 18:37:47 UTC | l10n: de.po: fix messages with abbreviated hashs The three dots in messages where the hash is abbreviated were misinterpreted and are fixed with this commit. Noticed-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 02 April 2015, 16:29:03 UTC |
| c9f0dbf | Phillip Sz | 21 March 2015, 12:52:37 UTC | l10n: de.po: add space before ellipsis Signed-off-by: Phillip Sz <phillip.szelat@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 02 April 2015, 16:29:03 UTC |
| 2b8bd44 | Jeff King | 01 April 2015, 21:08:56 UTC | howto: document more tools for recovery corruption Long ago, I documented a corruption recovery I did and gave some C code that I used to help find a flipped bit. I had to fix a similar case recently, and I ended up writing a few more tools. I hope nobody ever has to use these, but it does not hurt to share them, just in case. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2015, 05:44:03 UTC |
| 1a51b52 | Junio C Hamano | 01 April 2015, 06:15:45 UTC | push-to-deploy: allow pushing into an unborn branch and updating it Setting receive.denycurrentbranch to updateinstead and pushing into the current branch, when the working tree and the index is truly clean, is supposed to reset the working tree and the index to match the tree of the pushed commit. This did not work when pushing into an unborn branch. The code that drives push-to-checkout hook needs no change, as the interface is defined so that hook can decide what to do when the push is coming to an unborn branch and take an appropriate action since the beginning. Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2015, 05:40:10 UTC |
| 9585cb8 | Jonathan Nieder | 31 March 2015, 23:18:07 UTC | fast-import doc: remove suggested 16-parent limit Merges with an absurd number of parents are still a bad idea because they do not render well in tools like gitk, but if they are present in the repository being imported into git then there's no need to avoid reproducing them faithfully. In olden times, before v1.6.0-rc0~194 (2008-06-27), git commit-tree and higher-level tools built on top of it were limited to writing 16 parents for a commit. Nowadays normal git operations are happy to write more parents when asked, so the motivation for this note in the fast-import documentation is gone and we can remove it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2015, 00:02:29 UTC |
| cf8a8c6 | Junio C Hamano | 31 March 2015, 21:58:38 UTC | Sync with 2.3.5 * maint: Git 2.3.5 docs: clarify what git-rebase's "-p" / "--preserve-merges" does | 31 March 2015, 21:58:38 UTC |
| 52735a6 | Junio C Hamano | 31 March 2015, 21:57:10 UTC | Git 2.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2015, 21:57:10 UTC |
| ad00aeb | Junio C Hamano | 31 March 2015, 21:54:11 UTC | Merge branch 'ss/pull-rebase-preserve' into maint * ss/pull-rebase-preserve: docs: clarify what git-rebase's "-p" / "--preserve-merges" does docs: clarify "preserve" option wording for git-pull | 31 March 2015, 21:54:12 UTC |
| ab0fb57 | Junio C Hamano | 31 March 2015, 21:53:08 UTC | Merge branch 'jc/report-path-error-to-dir' into maint Code clean-up. * jc/report-path-error-to-dir: report_path_error(): move to dir.c | 31 March 2015, 21:53:08 UTC |
| a78fc4a | Junio C Hamano | 31 March 2015, 21:52:23 UTC | Merge branch 'ph/push-doc-cas' into maint * ph/push-doc-cas: git-push.txt: clean up force-with-lease wording | 31 March 2015, 21:52:24 UTC |
| d7bfb9e | Jérôme Zago | 03 April 2014, 20:49:47 UTC | gitweb.conf.txt: say "build-time", not "built-time" "build-time" is used everywhere else. Signed-off-by: Jérôme Zago <git-patch@agt-the-walker.net> Reviewed-by: Jakub Narębski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2015, 20:27:24 UTC |
| 9ce4ad3 | John Keeping | 31 March 2015, 01:22:11 UTC | streaming.c: fix a memleak When stream_blob_to_fd() opens an input stream with a filter, the filter gets discarded upon calling close_istream() before the function returns in the normal case. However, when we fail to open the stream, we failed to discard the filter. By discarding the filter in the failure case, give a consistent life-time rule of the filter to the callers; otherwise the callers need to conditionally discard the filter themselves, and this function does not give enough hint for the caller to do so correctly. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2015, 19:14:42 UTC |
| c8c3f1d | Paul Tan | 31 March 2015, 13:39:27 UTC | enter_repo(): fix docs to match code In b3256eb (standardize and improve lookup rules for external local repos), enter_repo() was modified to use a different precedence ordering of suffixes for DWIM of the repository path, and to ensure that the repository path is actually valid instead of just testing for existence. However, the documentation was not modified to reflect these changes. Fix the documentation to match the code. Documentation contributed by Jeff King. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2015, 17:19:53 UTC |
| 0e32d4b | Stefan Beller | 31 March 2015, 01:22:09 UTC | wt-status.c: fix a memleak wt_shortstatus_print_tracking() calls shorten_unambiguous_ref(), which returns a newly allocated memory the caller takes ownership of; it is necessary to free `base` when the function is done with it. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2015, 05:12:38 UTC |
| f907282 | Jeff King | 31 March 2015, 01:08:54 UTC | cherry-pick: fix docs describing handling of empty commits Commit b27cfb0 (git-cherry-pick: Add keep-redundant-commits option, 2012-04-20), added the --keep-redundant-commits option, and switched the default behavior (without that option) to silently ignore empty commits. Later, the second half of that commit was reverted in ac2b0e8 (cherry-pick: regression fix for empty commits, 2012-05-29), but the documentation added for --keep-redundant-commits was never updated to match. Let's do so now. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2015, 04:49:51 UTC |
| 02507f4 | Tran Ngoc Quan | 27 March 2015, 09:04:44 UTC | l10n: vi.po: Updated Vietnamese translation Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 31 March 2015, 01:48:38 UTC |
| 814ff31 | Jiang Xin | 16 February 2015, 13:34:19 UTC | l10n: zh_CN: translations for git v2.4.0-rc0 Translate 99 updated messages (2305t0f0u) for git v2.4.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 31 March 2015, 01:43:58 UTC |
| d0cec14 | Jiang Xin | 31 March 2015, 01:38:47 UTC | Merge branch 'fr-v2.4.0-rc0' of git://github.com/jnavila/git * 'fr-v2.4.0-rc0' of git://github.com/jnavila/git: l10n: fr.po v2.4.0-rc0 round 1 | 31 March 2015, 01:38:47 UTC |
| d50d31e | Sebastian Schuberth | 30 March 2015, 09:29:46 UTC | docs: clarify what git-rebase's "-p" / "--preserve-merges" does Ignoring a merge can be read as ignoring the changes a merge commit introduces altogether, as if the entire side branch the merge commit merged was removed from the history. But that is not what happens if "-p" is not specified. What happens is that the individual commits a merge commit introduces are replayed in order, and only any possible merge conflict resolutions or manual amendments to the merge commit are ignored. Get this straight in the docs. Also, do not say that merge commits are *tried* to be recreated. As that is true almost everywhere it is better left unsaid. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2015, 20:44:29 UTC |
| 7298ca7 | Jean-Noel Avila | 29 March 2015, 07:54:56 UTC | l10n: fr.po v2.4.0-rc0 round 1 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 30 March 2015, 08:54:05 UTC |
| d3c0811 | Ivan Ukhov | 29 March 2015, 08:32:55 UTC | parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval When 20d1c652 (parse-options: remove unused OPT_SET_PTR, 2014-03-30) removed OPT_SET_PTR, the comment in the header that describes what the option did to defval field was left behind by mistake. Remove it. Signed-off-by: Ivan Ukhov <ivan.ukhov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2015, 02:56:12 UTC |
| d03ead9 | Alex Henrie | 28 March 2015, 21:07:36 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 28 March 2015, 21:07:36 UTC |
| a3b75b3 | Junio C Hamano | 28 March 2015, 16:42:49 UTC | Sync with maint * maint: Prepare for 2.3.5 2.3.2 release notes: typofix | 28 March 2015, 16:42:49 UTC |
| 9e4ab3a | Junio C Hamano | 28 March 2015, 16:41:51 UTC | RelNotes: minor doc updates Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2015, 16:41:51 UTC |
| 31137f5 | Junio C Hamano | 28 March 2015, 16:37:53 UTC | Merge branch 'ph/push-doc-cas' * ph/push-doc-cas: git-push.txt: clean up force-with-lease wording | 28 March 2015, 16:37:53 UTC |
| 3a18352 | Junio C Hamano | 28 March 2015, 16:37:51 UTC | Merge branch 'ss/pull-rebase-preserve' * ss/pull-rebase-preserve: docs: clarify "preserve" option wording for git-pull | 28 March 2015, 16:37:52 UTC |
| 2c97724 | Junio C Hamano | 28 March 2015, 16:36:30 UTC | Prepare for 2.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2015, 16:36:30 UTC |
| 4eea8e3 | Junio C Hamano | 28 March 2015, 16:33:15 UTC | Merge branch 'sg/completion-gitcomp-nl-for-refs' into maint Code clean-up. * sg/completion-gitcomp-nl-for-refs: completion: use __gitcomp_nl() for completing refs | 28 March 2015, 16:33:15 UTC |
| a070d62 | Junio C Hamano | 28 March 2015, 16:33:15 UTC | Merge branch 'jk/simplify-csum-file-sha1fd-check' into maint Code simplification. * jk/simplify-csum-file-sha1fd-check: sha1fd_check: die when we cannot open the file | 28 March 2015, 16:33:15 UTC |
| b265061 | Junio C Hamano | 28 March 2015, 16:33:14 UTC | Merge branch 'tg/test-index-v4' into maint A test fix. * tg/test-index-v4: t1700: make test pass with index-v4 | 28 March 2015, 16:33:14 UTC |
| 2217579 | Junio C Hamano | 28 March 2015, 16:33:13 UTC | Merge branch 'nd/doc-git-index-version' into maint Doc clean-up. * nd/doc-git-index-version: git.txt: list index versions in plain English | 28 March 2015, 16:33:13 UTC |
| 245dd15 | Junio C Hamano | 28 March 2015, 16:33:12 UTC | Merge branch 'ct/prompt-untracked-fix' into maint The prompt script (in contrib/) did not show the untracked sign when working in a subdirectory without any untracked files. * ct/prompt-untracked-fix: git prompt: use toplevel to find untracked files | 28 March 2015, 16:33:12 UTC |
| b70cec0 | Junio C Hamano | 28 March 2015, 16:33:11 UTC | Merge branch 'ws/grep-quiet-no-pager' into maint Even though "git grep --quiet" is run merely to ask for the exit status, we spawned the pager regardless. Stop doing that. * ws/grep-quiet-no-pager: grep: fix "--quiet" overwriting current output | 28 March 2015, 16:33:11 UTC |
| a5d3154 | Junio C Hamano | 28 March 2015, 16:33:10 UTC | Merge branch 'jc/submitting-patches-mention-send-email' into maint Recommend format-patch and send-email for those who want to submit patches to this project. * jc/submitting-patches-mention-send-email: SubmittingPatches: encourage users to use format-patch and send-email | 28 March 2015, 16:33:10 UTC |
| 73d8bfd | Junio C Hamano | 28 March 2015, 16:33:09 UTC | Merge branch 'jk/cleanup-failed-clone' into maint An failure early in the "git clone" that started creating the working tree and repository could have resulted in some directories and files left without getting cleaned up. * jk/cleanup-failed-clone: clone: drop period from end of die_errno message clone: initialize atexit cleanup handler earlier | 28 March 2015, 16:33:09 UTC |
| 591a1da | Junio C Hamano | 28 March 2015, 16:33:08 UTC | Merge branch 'jk/fetch-pack' into maint "git fetch" that fetches a commit using the allow-tip-sha1-in-want extension could have failed to fetch all the requested refs. * jk/fetch-pack: fetch-pack: remove dead assignment to ref->new_sha1 fetch_refs_via_pack: free extra copy of refs filter_ref: make a copy of extra "sought" entries filter_ref: avoid overwriting ref->old_sha1 with garbage | 28 March 2015, 16:33:08 UTC |
| 07e3f27 | Junio C Hamano | 28 March 2015, 16:33:07 UTC | Merge branch 'tg/fix-check-order-with-split-index' into maint The split-index mode introduced at v2.3.0-rc0~41 was broken in the codepath to protect us against a broken reimplementation of Git that writes an invalid index with duplicated index entries, etc. * tg/fix-check-order-with-split-index: read-cache: fix reading of split index | 28 March 2015, 16:33:07 UTC |
