| 0d1c285 | Junio C Hamano | 02 February 2015, 20:05:56 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: ca.po: Fix trailing whitespace | 02 February 2015, 20:05:56 UTC |
| 7471cf8 | Alex Henrie | 30 January 2015, 22:02:34 UTC | l10n: ca.po: Fix trailing whitespace Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 30 January 2015, 22:02:34 UTC |
| 15598cf | Junio C Hamano | 27 January 2015, 22:39:53 UTC | Git 2.3.0-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2015, 22:39:53 UTC |
| ff76d36 | Junio C Hamano | 27 January 2015, 19:01:05 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: de.po: correct singular form l10n: de.po: translate "leave behind" correctly l10n: de.po: fix typo l10n: ca.po: update translation | 27 January 2015, 19:01:05 UTC |
| b4fde1e | Jiang Xin | 27 January 2015, 07:00:48 UTC | Merge branch 'master' of git://github.com/alexhenrie/git-po * 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation | 27 January 2015, 07:00:48 UTC |
| 07586eb | Michael J Gruber | 26 January 2015, 15:34:32 UTC | l10n: de.po: correct singular form Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 26 January 2015, 18:36:04 UTC |
| 2f334c6 | Michael J Gruber | 26 January 2015, 15:34:31 UTC | l10n: de.po: translate "leave behind" correctly This message is about leaving orphaned commits behind, not about behind an upstream branch. Try to make this clear. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 26 January 2015, 18:36:04 UTC |
| 3b36ef9 | Benedikt Heine | 25 January 2015, 11:00:04 UTC | l10n: de.po: fix typo Signed-off-by: Benedikt Heine <bebe@bebehei.de> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 26 January 2015, 18:36:04 UTC |
| 573ed5e | Alex Henrie | 26 January 2015, 17:12:50 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 26 January 2015, 17:12:50 UTC |
| 76afe74 | Junio C Hamano | 22 January 2015, 21:46:45 UTC | Merge branch 'js/t1050' * js/t1050: t1050-large: generate large files without dd | 22 January 2015, 21:46:45 UTC |
| 67b5440 | Junio C Hamano | 22 January 2015, 21:46:38 UTC | Merge branch 'ak/cat-file-clean-up' * ak/cat-file-clean-up: cat-file: use "type" and "size" from outer scope | 22 January 2015, 21:46:38 UTC |
| d588d4d | Junio C Hamano | 22 January 2015, 21:45:07 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: correct indentation of show-branch usage l10n: de.po: translate 3 messages l10n: zh_CN: various fixes on command arguments l10n: vi.po(2298t): Updated 3 new strings l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 2 l10n: git.pot: v2.3.0 round 2 (3 updated) l10n: de.po: translate 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes | 22 January 2015, 21:45:07 UTC |
| ab9432d | Junio C Hamano | 22 January 2015, 21:44:47 UTC | Merge branch 'sh/asciidoc-git-version-fix' * sh/asciidoc-git-version-fix: Documentation: fix version numbering | 22 January 2015, 21:44:47 UTC |
| a4c0444 | Sven van Haastregt | 22 January 2015, 19:32:33 UTC | Documentation: fix version numbering Version numbers in asciidoc-generated content (such as man pages) went missing as of da8a366 (Documentation: refactor common operations into variables). Fix by putting the underscore back in the variable name. Signed-off-by: Sven van Haastregt <svenvh@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2015, 21:44:14 UTC |
| ee443cf | Junio C Hamano | 22 January 2015, 21:42:37 UTC | Merge branch 'jh/empty-notes' * jh/empty-notes: Fix unclosed here document in t3301.sh | 22 January 2015, 21:42:37 UTC |
| 85cb1d0 | Kacper Kornet | 22 January 2015, 11:59:36 UTC | Fix unclosed here document in t3301.sh Commit 908a3203632a02568df230c0fccf9a2cd8da24e6 introduced indentation to here documents in t3301.sh. However in one place <<-EOF was missing -, which broke this test when run with mksh-50d. This commit fixes it. Signed-off-by: Kacper Kornet <draenog@pld-linux.org> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2015, 20:23:42 UTC |
| 1e60744 | Jiang Xin | 21 January 2015, 07:05:03 UTC | l10n: correct indentation of show-branch usage An indentation error was found right after we started l10n round 2, and commit d6589d1 (show-branch: fix indentation of usage string) and this update would fix it. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 21 January 2015, 07:35:37 UTC |
| 54d80a9 | Jiang Xin | 21 January 2015, 06:20:53 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 3 messages l10n: zh_CN: various fixes on command arguments l10n: vi.po(2298t): Updated 3 new strings l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 2 l10n: git.pot: v2.3.0 round 2 (3 updated) l10n: de.po: translate 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes | 21 January 2015, 06:20:53 UTC |
| 627736c | Junio C Hamano | 21 January 2015, 00:54:58 UTC | Git 2.3.0-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2015, 01:35:41 UTC |
| ea6e82c | Junio C Hamano | 21 January 2015, 01:31:50 UTC | Merge branch 'jk/http-push-symref-fix' * jk/http-push-symref-fix: http-push: trim trailing newline from remote symref | 21 January 2015, 01:31:50 UTC |
| 17ad371 | Junio C Hamano | 21 January 2015, 00:16:09 UTC | Merge branch 'ak/show-branch-usage-string' * ak/show-branch-usage-string: show-branch: fix indentation of usage string | 21 January 2015, 00:16:09 UTC |
| d6589d1 | Ralf Thielow | 20 January 2015, 19:30:28 UTC | show-branch: fix indentation of usage string Noticed-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2015, 00:12:54 UTC |
| d06ce4a | Junio C Hamano | 20 January 2015, 23:57:22 UTC | Merge branch 'jk/colors' * jk/colors: parse_color: fix return value for numeric color values 0-8 | 20 January 2015, 23:57:22 UTC |
| 3759d27 | Jeff King | 20 January 2015, 22:14:48 UTC | parse_color: fix return value for numeric color values 0-8 When commit 695d95d refactored the color parsing, it missed a "return 0" when parsing literal numbers 0-8 (which represent basic ANSI colors), leading us to report these colors as an error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2015, 23:56:03 UTC |
| a235de4 | Ralf Thielow | 19 January 2015, 06:15:29 UTC | l10n: de.po: translate 3 messages Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 20 January 2015, 18:23:57 UTC |
| d9d56b2 | Jiang Xin | 18 January 2015, 12:37:57 UTC | l10n: zh_CN: various fixes on command arguments Updated translations for Git 2.3.0 l10n round 2, and fixed various translations for command arguments. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 19 January 2015, 02:23:53 UTC |
| 07361f1 | Jiang Xin | 19 January 2015, 02:12:46 UTC | Merge branch 'v2.3.0' of git://github.com/jnavila/git * 'v2.3.0' of git://github.com/jnavila/git: l10n: fr.po v2.3.0 round 2 | 19 January 2015, 02:12:46 UTC |
| 482f68e | Jiang Xin | 19 January 2015, 02:10:57 UTC | Merge branch 'master' of git://github.com/nafmo/git-l10n-sv * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (2298t0f0u) | 19 January 2015, 02:10:57 UTC |
| d1f9c7b | Tran Ngoc Quan | 19 January 2015, 00:20:28 UTC | l10n: vi.po(2298t): Updated 3 new strings Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 19 January 2015, 00:20:28 UTC |
| 0ef2795 | Peter Krefting | 18 January 2015, 19:30:18 UTC | l10n: sv.po: Update Swedish translation (2298t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 18 January 2015, 19:30:18 UTC |
| bf41b71 | Jean-Noel Avila | 18 January 2015, 16:03:27 UTC | l10n: fr.po v2.3.0 round 2 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 18 January 2015, 16:03:27 UTC |
| 105979f | Jiang Xin | 18 January 2015, 03:26:57 UTC | l10n: git.pot: v2.3.0 round 2 (3 updated) Generate po/git.pot from v2.3.0-rc0-44-ga94655d for git v2.3.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 18 January 2015, 03:26:57 UTC |
| 48a9a6b | Jiang Xin | 18 January 2015, 03:24:00 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 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes | 18 January 2015, 03:24:00 UTC |
| 124d809 | Ralf Thielow | 31 December 2014, 19:06:51 UTC | l10n: de.po: translate 13 new messages Translate 13 new messages came from git.pot update in beb691f (l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 17 January 2015, 17:10:46 UTC |
| e1a05ad | Ralf Thielow | 31 December 2014, 19:16:35 UTC | l10n: de.po: fix typo Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 17 January 2015, 17:10:02 UTC |
| 463243d | Ralf Thielow | 06 December 2014, 19:16:49 UTC | l10n: de.po: translate "track" as "versionieren" Suggested-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 17 January 2015, 17:09:56 UTC |
| 04cb2f2 | Jiang Xin | 04 January 2015, 04:27:38 UTC | l10n: zh_CN: translations for git v2.3.0-rc0 Translate 13 new messages (2298t0f0u) for git v2.3.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 17 January 2015, 07:28:36 UTC |
| a94655d | Ramkumar Ramachandra | 10 January 2015, 14:55:11 UTC | git-svn: make it play nicely with submodules It's a simple matter of opening the directory specified in the gitfile. [ew: tweaked check to avoid open() on directories] Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 15 January 2015, 08:35:55 UTC |
| 9a2bb05 | Ramkumar Ramachandra | 10 January 2015, 14:35:10 UTC | Git::SVN: handle missing ref_id case correctly ref_id should not match "refs/remotes/". [ew: dropped initial hunk for GIT_SVN_ID at Ramkumar's request] Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 15 January 2015, 08:35:55 UTC |
| 2a26377 | Peter Krefting | 14 January 2015, 21:55:49 UTC | l10n: sv.po: Update Swedish translation (2298t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 14 January 2015, 21:55:49 UTC |
| d0a042a | Johannes Sixt | 14 January 2015, 20:28:56 UTC | t1050-large: generate large files without dd For some unknown reason, the dd on my Windows box segfaults randomly, but since recently, it does so much more often than it used to, which makes running the test suite burdensome. Use printf to write large files instead of dd. To emphasize that three of the large blobs are exact copies, use cp to allocate them. The new code makes the files a bit smaller, and they are not sparse anymore, but the tests do not depend on these properties. We do not want to use test-genrandom here (which is used to generate large files elsewhere in t1050), so that the files can be compressed well (which keeps the run-time short). The files are now large text files, not binary files. But since they are larger than core.bigfilethreshold they are diagnosed as binary by Git. For this reason, the 'git diff' tests that check the output for "Binary files differ" still pass. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2015, 21:08:12 UTC |
| 563d4e5 | Junio C Hamano | 14 January 2015, 20:44:03 UTC | Fifth batch for 2.3 cycle Hopefully this will be the final feature update for 2.3-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2015, 20:44:03 UTC |
| 670f6a7 | Junio C Hamano | 14 January 2015, 20:41:38 UTC | Merge branch 'po/doc-core-ignorestat' * po/doc-core-ignorestat: doc: core.ignoreStat update, and clarify the --assume-unchanged effect doc: core.ignoreStat clarify the --assume-unchanged effect | 14 January 2015, 20:41:38 UTC |
| 401a317 | Junio C Hamano | 14 January 2015, 20:39:02 UTC | Merge branch 'rc/for-each-ref-tracking' * rc/for-each-ref-tracking: for-each-ref: always check stat_tracking_info()'s return value | 14 January 2015, 20:39:02 UTC |
| 63a0e83 | Junio C Hamano | 14 January 2015, 20:37:21 UTC | Merge branch 'rh/autoconf-rhel3' Build update for older RHEL. * rh/autoconf-rhel3: configure.ac: check for HMAC_CTX_cleanup configure.ac: check for clock_gettime and CLOCK_MONOTONIC configure.ac: check 'tv_nsec' field in 'struct stat' | 14 January 2015, 20:37:21 UTC |
| 09deda3 | Junio C Hamano | 14 January 2015, 20:37:19 UTC | Merge branch 'ak/fewer-includes' * ak/fewer-includes: cat-file: remove unused includes git.c: remove unnecessary #includes | 14 January 2015, 20:37:19 UTC |
| ce8e4e3 | Junio C Hamano | 14 January 2015, 20:37:13 UTC | Merge branch 'ak/doc-add-v-n-options' * ak/doc-add-v-n-options: Documentation: list long options for -v and -n | 14 January 2015, 20:37:14 UTC |
| d62078e | Junio C Hamano | 14 January 2015, 20:37:07 UTC | Merge branch 'ak/show-branch-usage-string' * ak/show-branch-usage-string: show-branch: line-wrap show-branch usage | 14 January 2015, 20:37:07 UTC |
| 601ca92 | Junio C Hamano | 14 January 2015, 20:36:45 UTC | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' We try to see if "tput" gives a useful result before switching TERM to dumb and moving HOME to point to our fake location for stability of the tests, and then use the command when coloring the output from the tests, but there is no guarantee "tput" works after switching HOME. * rh/test-color-avoid-terminfo-in-original-home: test-lib.sh: do tests for color support after changing HOME test-lib: use 'test ...' instead of '[ ... ]' | 14 January 2015, 20:36:45 UTC |
| 9920c71 | Junio C Hamano | 14 January 2015, 20:35:48 UTC | Merge branch 'tf/prompt-preserve-exit-status' Using the exit status of the last command in the prompt, e.g. PS1='$(__git_ps1) $? ', did not work well because the helper function stomped on the exit status. * tf/prompt-preserve-exit-status: git-prompt: preserve value of $? in all cases | 14 January 2015, 20:35:49 UTC |
| e1ef7d1 | Junio C Hamano | 14 January 2015, 20:34:01 UTC | Merge branch 'rh/hide-prompt-in-ignored-directory' * rh/hide-prompt-in-ignored-directory: git-prompt.sh: allow to hide prompt for ignored pwd git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt | 14 January 2015, 20:34:01 UTC |
| 1e7ef5d | Junio C Hamano | 14 January 2015, 20:33:57 UTC | Merge branch 'mm/complete-rebase-autostash' * mm/complete-rebase-autostash: git-completion: add --autostash for 'git rebase' | 14 January 2015, 20:33:57 UTC |
| 8128835 | Junio C Hamano | 14 January 2015, 20:33:50 UTC | Merge branch 'aw/doc-smtp-ssl-cert-path' A long overdue documentation update to match an age-old code update. * aw/doc-smtp-ssl-cert-path: correct smtp-ssl-cert-path description | 14 January 2015, 20:33:50 UTC |
| 4175331 | Junio C Hamano | 14 January 2015, 20:33:45 UTC | Merge branch 'sp/subtree-doc' * sp/subtree-doc: subtree: fix AsciiDoc list item continuation | 14 January 2015, 20:33:46 UTC |
| e9f9119 | Junio C Hamano | 14 January 2015, 20:32:39 UTC | Merge branch 'km/log-usage-string-i18n' * km/log-usage-string-i18n: log.c: fix translation markings | 14 January 2015, 20:32:39 UTC |
| 2202ab1 | Junio C Hamano | 14 January 2015, 20:31:50 UTC | Merge branch 'km/imap-send-libcurl-options' Now imap-send learned to talk to the server using cURL library, allow the same GIT_CURL_VERBOSE environment variable to control the verbosity of the chattering. * km/imap-send-libcurl-options: imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY imap-send.c: support GIT_CURL_VERBOSE | 14 January 2015, 20:31:50 UTC |
| 6d9f0c7 | Junio C Hamano | 14 January 2015, 20:30:26 UTC | Merge branch 'jk/prune-packed-server-info' Fix recent breakage in Git 2.2 that started creating info/refs and objects/info/packs files with permission bits tighter than user's umask. * jk/prune-packed-server-info: update-server-info: create info/* with mode 0666 t1301: set umask in reflog sharedrepository=group test | 14 January 2015, 20:30:27 UTC |
| 7fd92d9 | Junio C Hamano | 14 January 2015, 20:29:47 UTC | Merge branch 'js/remote-add-with-insteadof' "git remote add $name $URL" is now allowed when "url.$URL.insteadOf" is already defined. * js/remote-add-with-insteadof: Add a regression test for 'git remote add <existing> <same-url>' git remote: allow adding remotes agreeing with url.<...>.insteadOf | 14 January 2015, 20:29:47 UTC |
| f6786c8 | Jeff King | 13 January 2015, 02:28:58 UTC | http-push: trim trailing newline from remote symref When we fetch a symbolic ref file from the remote, we get the whole string "ref: refs/heads/master\n", recognize it by skipping past the "ref: ", and store the rest. We should chomp the trailing newline. This bug was introduced in ae021d8 (use skip_prefix to avoid magic numbers, 2014-06-18), which did not notice that the length computation fed to xmemdupz was quietly tweaked by 1 to account for this. We can solve it by explicitly trimming the newline, which is more obvious. Note that we use strbuf_rtrim here, which will actually cut off any trailing whitespace, not just a single newline. This is a good thing, though, as it makes our parsing more liberal (and spaces are not valid in refnames anyway). Signed-off-by: Jeff King <peff@peff.net> Tested-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2015, 18:28:02 UTC |
| 6babe76 | Tony Finch | 14 January 2015, 10:06:28 UTC | git-prompt: preserve value of $? in all cases Signed-off-by: Tony Finch <dot@dotat.at> Reviewed-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2015, 18:11:49 UTC |
| 3310048 | Alexander Kuleshov | 10 January 2015, 18:13:23 UTC | cat-file: use "type" and "size" from outer scope In cat_one_file(), "type" and "size" variables are defined in the function scope, and then two variables of the same name are defined in a block in one of the if/else statement, hiding the definitions in the outer scope. Because the values of the outer variables before the control enters this scope, however, do not have to be preserved, we can remove useless definitions of variables from the inner scope safely without breaking anything. Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2015, 20:36:04 UTC |
| 9905988 | Jean-Noel Avila | 13 January 2015, 19:22:58 UTC | l10n: fr.po v2.3.0 round 1 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 13 January 2015, 19:23:41 UTC |
| fbf5d8c | Tran Ngoc Quan | 13 January 2015, 07:23:12 UTC | l10n: vi.po(2298t): Updated and change Plural-Forms Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 13 January 2015, 07:23:12 UTC |
| beb691f | Jiang Xin | 13 January 2015, 06:05:57 UTC | l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) Generate po/git.pot from v2.3.0-rc0 for git v2.3.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 13 January 2015, 06:05:57 UTC |
| 7695982 | Jiang Xin | 13 January 2015, 06:04:57 UTC | Merge branch 'master' of git://github.com/alexhenrie/git-po * 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: various fixes | 13 January 2015, 06:04:57 UTC |
| 92be938 | Philip Oakley | 05 January 2015, 22:22:53 UTC | doc: core.ignoreStat update, and clarify the --assume-unchanged effect The assume-unchanged bit, and consequently core.ignoreStat, can be misunderstood. Be assertive about the expectation that file changes should notified to Git. Overhaul the general wording thus: 1. direct description of what is ignored given first. 2. example instruction of the user manual action required. 3. use sideways indirection for assume-unchanged and update-index references. 4. add a 'normally' to give leeway for the change detection. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2015, 23:12:05 UTC |
| b6160d9 | Raphael Kubo da Costa | 05 January 2015, 09:58:55 UTC | for-each-ref: always check stat_tracking_info()'s return value The code handling %(upstream:track) and %(upstream:trackshort) assumed that it always had a valid branch that had been sanitized earlier in populate_value(), and thus did not check the return value of the call to stat_tracking_info(). While there is indeed some sanitization code that basically corresponds to stat_tracking_info() returning 0 (no base branch set), the function can also return -1 when the base branch did exist but has since then been deleted. In this case, num_ours and num_theirs had undefined values and a call to `git for-each-ref --format="%(upstream:track)"` could print spurious values such as [behind -111794512] [ahead 38881640, behind 5103867] even for repositories with one single commit. Verify stat_tracking_info()'s return value and do not print anything if it returns -1. This behavior also matches the documentation ("has no effect if the ref does not have tracking information associated with it"). Helped-by: Eric Sunshine <sunshine@sunshineco.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2015, 23:10:46 UTC |
| addfb21 | Junio C Hamano | 12 January 2015, 22:12:42 UTC | Git 2.3.0-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2015, 22:12:42 UTC |
| def6dd9 | Junio C Hamano | 12 January 2015, 22:08:42 UTC | Sync with 2.2.2 | 12 January 2015, 22:08:42 UTC |
| fdf96a2 | Junio C Hamano | 12 January 2015, 22:06:12 UTC | Git 2.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2015, 22:06:12 UTC |
| 9f16184 | Junio C Hamano | 12 January 2015, 22:02:54 UTC | Merge branch 'jk/read-packed-refs-without-path-max' into maint * jk/read-packed-refs-without-path-max: read_packed_refs: use skip_prefix instead of static array read_packed_refs: pass strbuf to parse_ref_line read_packed_refs: use a strbuf for reading lines | 12 January 2015, 22:02:54 UTC |
| d0879b3 | Junio C Hamano | 12 January 2015, 22:02:19 UTC | Merge branch 'mg/add-ignore-errors' into maint * mg/add-ignore-errors: add: ignore only ignored files | 12 January 2015, 22:02:19 UTC |
| efc028b | Junio C Hamano | 12 January 2015, 22:02:05 UTC | Merge branch 'mh/find-uniq-abbrev' into maint * mh/find-uniq-abbrev: sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev | 12 January 2015, 22:02:05 UTC |
| 9ea21fa | Junio C Hamano | 12 January 2015, 22:01:18 UTC | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint * jk/approxidate-avoid-y-d-m-over-future-dates: approxidate: allow ISO-like dates far in the future pass TIME_DATE_NOW to approxidate future-check | 12 January 2015, 22:01:18 UTC |
| ba1edc9 | Junio C Hamano | 12 January 2015, 22:00:16 UTC | Merge branch 'rw/apply-does-not-take-ignore-date' into maint * rw/apply-does-not-take-ignore-date: git-am.txt: --ignore-date flag is not passed to git-apply | 12 January 2015, 22:00:16 UTC |
| 417a5b2 | Junio C Hamano | 12 January 2015, 20:19:17 UTC | Merge branch 'jk/for-each-reflog-ent-reverse' into maint * jk/for-each-reflog-ent-reverse: for_each_reflog_ent_reverse: turn leftover check into assertion for_each_reflog_ent_reverse: fix newlines on block boundaries | 12 January 2015, 20:19:17 UTC |
| 832258d | Junio C Hamano | 12 January 2015, 19:38:56 UTC | Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository' Earlier we made "rev-list --object-edge" more aggressively list the objects at the edge commits, in order to reduce number of objects fetched into a shallow repository, but the change affected cases other than "fetching into a shallow repository" and made it unusably slow (e.g. fetching into a normal repository should not have to suffer the overhead from extra processing). Limit it to a more specific case by introducing --objects-edge-aggressive, a new option to rev-list. * bc/fetch-thin-less-aggressive-in-normal-repository: pack-objects: use --objects-edge-aggressive for shallow repos rev-list: add an option to mark fewer edges as uninteresting Documentation: add missing article in rev-list-options.txt | 12 January 2015, 19:38:57 UTC |
| e20d5a2 | Junio C Hamano | 12 January 2015, 19:38:54 UTC | Merge branch 'sb/doc-submitting-patches-keep-notes' * sb/doc-submitting-patches-keep-notes: SubmittingPatches: explain rationale for using --notes with format-patch | 12 January 2015, 19:38:55 UTC |
| 7a353ec | Junio C Hamano | 12 January 2015, 19:38:51 UTC | Merge branch 'rs/simplify-transport-get' * rs/simplify-transport-get: transport: simplify duplicating a substring in transport_get() using xmemdupz() | 12 January 2015, 19:38:53 UTC |
| acddf49 | Junio C Hamano | 12 January 2015, 19:38:39 UTC | Merge branch 'rs/simplify-parsing-commit-tree-S' * rs/simplify-parsing-commit-tree-S: commit-tree: simplify parsing of option -S using skip_prefix() | 12 January 2015, 19:38:48 UTC |
| d61e790 | Junio C Hamano | 12 January 2015, 19:38:32 UTC | Merge branch 'rs/plug-strbuf-leak-in-merge' * rs/plug-strbuf-leak-in-merge: merge: release strbuf after use in suggest_conflicts() | 12 January 2015, 19:38:37 UTC |
| 97488ab | Junio C Hamano | 12 January 2015, 19:38:30 UTC | Merge branch 'rs/plug-strbuf-leak-in-lock-ref' * rs/plug-strbuf-leak-in-lock-ref: refs: plug strbuf leak in lock_ref_sha1_basic() | 12 January 2015, 19:38:31 UTC |
| c00e1c5 | Junio C Hamano | 12 January 2015, 19:38:23 UTC | Merge branch 'es/checkout-index-temp' "git checkout-index --temp=$target $path" did not work correctly for paths outside the current subdirectory in the project. * es/checkout-index-temp: checkout-index: fix --temp relative path mangling t2004: demonstrate broken relative path printing t2004: standardize file naming in symlink test t2004: drop unnecessary write-tree/read-tree t2004: modernize style | 12 January 2015, 19:38:28 UTC |
| 42618bc | Junio C Hamano | 12 January 2015, 19:38:14 UTC | Merge branch 'cc/bisect-rev-parsing' The logic in "git bisect bad HEAD" etc. to avoid forcing the test of the common ancestor of bad and good commits was broken. * cc/bisect-rev-parsing: bisect: add test to check that revs are properly parsed bisect: parse revs before passing them to check_expected_revs() | 12 January 2015, 19:38:19 UTC |
| a2681d2 | Alexander Kuleshov | 09 January 2015, 07:48:40 UTC | Documentation: list long options for -v and -n Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2015, 00:23:41 UTC |
| 10aff31 | Alexander Kuleshov | 08 January 2015, 18:56:06 UTC | cat-file: remove unused includes - "exec_cmd.h" became unnecessary at b931aa5a (Call builtin ls-tree in git-cat-file -p, 2006-05-26), when it changed an earlier code that delegated tree display to "ls-tree" via the run_command() API (hence needing "exec_cmd.h") to call cmd_ls_tree() directly. We should have removed the include in the same commit, but we forgot to do so. - "diff.h" was added at e5fba602 (textconv: support for cat_file, 2010-06-15), together with "userdiff.h", but "userdiff.h" can be included without including "diff.h"; the header was unnecessary from the beginning. - "tag.h" and "tree.h" were necessary since 8e440259 (Use blob_, commit_, tag_, and tree_type throughout., 2006-04-02) to check the type of object by comparing typename with tree_type and tag_type (pointers to extern strings). 21666f1a (convert object type handling from a string to a number, 2007-02-26) made these <type>_type strings unnecessary, and it could have switched to include "object.h", which is necessary to use typename(), but it forgot to do so. Because "tag.h" and "tree.h" include "object.h", it did not need to explicitly include "object.h" in order to start using typename() itself. We do not even have to include "object.h" after removing these two #includes, because "builtin.h" includes "commit.h" which in turn includes "object.h" these days. This happened at 7b9c0a69 (git-commit-tree: make it usable from other builtins, 2008-07-01). Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2015, 00:18:35 UTC |
| 50fea42 | Alexander Kuleshov | 09 January 2015, 10:12:33 UTC | git.c: remove unnecessary #includes "cache.h" and "commit.h" are already included via "builtin.h". We started to include "quote.h" at 575ba9d6 (GIT_TRACE: show which built-in/external commands are executed, 2006-06-25) that wanted to use sq_quote_print(). When 6ce4e61f (Trace into a file or an open fd and refactor tracing code., 2006-09-02) introduced trace.c API, the calls this file makes to sq_quote_print() were replaced by calls to trace_argv_printf() that are declared in "cache.h", which this file already includes. We should have stopped including "quote.h" in that commit, but forgot to do so. Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2015, 00:16:56 UTC |
| 88e0118 | Reuben Hawkins | 08 January 2015, 20:00:57 UTC | configure.ac: check for HMAC_CTX_cleanup OpenSSL version 0.9.6b and before defined the function HMAC_cleanup. Newer versions define HMAC_CTX_cleanup. Check for HMAC_CTX_cleanup and fall back to HMAC_cleanup when the newer function is missing. Signed-off-by: Reuben Hawkins <reubenhwk@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2015, 23:33:57 UTC |
| a6c3c63 | Reuben Hawkins | 08 January 2015, 20:00:56 UTC | configure.ac: check for clock_gettime and CLOCK_MONOTONIC Set or clear Makefile variables HAVE_CLOCK_GETTIME and HAVE_CLOCK_MONOTONIC based upon results of the checks (overriding default values from config.mak.uname). CLOCK_MONOTONIC isn't available on RHEL3, but there are still RHEL3 systems being used in production. Signed-off-by: Reuben Hawkins <reubenhwk@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2015, 23:33:39 UTC |
| 8bd2c97 | Reuben Hawkins | 08 January 2015, 20:00:55 UTC | configure.ac: check 'tv_nsec' field in 'struct stat' Detect 'tv_nsec' field in 'struct stat' and set Makefile variable NO_NSEC appropriately. A side-effect of the above detection is that we also determine whether 'stat.st_mtimespec' is available, so, as a bonus, set the Makefile variable USE_ST_TIMESPEC, as well. Signed-off-by: Reuben Hawkins <reubenhwk@gmail.com> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2015, 23:33:39 UTC |
| 9990273 | Alexander Kuleshov | 08 January 2015, 18:08:36 UTC | show-branch: line-wrap show-branch usage Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 January 2015, 20:08:06 UTC |
| 1e6f5b2 | Junio C Hamano | 07 January 2015, 21:12:54 UTC | Fourth batch for 2.3 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2015, 21:28:37 UTC |
| ee6e4c7 | Junio C Hamano | 07 January 2015, 21:28:29 UTC | Merge branch 'maint' * maint: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:28:29 UTC |
| 7ba4626 | Junio C Hamano | 07 January 2015, 21:28:10 UTC | Merge branch 'maint-2.1' into maint * maint-2.1: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:28:10 UTC |
| 3c84ac8 | Junio C Hamano | 07 January 2015, 21:27:56 UTC | Merge branch 'maint-2.0' into maint-2.1 * maint-2.0: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:27:56 UTC |
| 282616c | Junio C Hamano | 07 January 2015, 21:27:19 UTC | Merge branch 'maint-1.9' into maint-2.0 * maint-1.9: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:27:19 UTC |
| 64a03e9 | Junio C Hamano | 07 January 2015, 21:27:13 UTC | Merge branch 'maint-1.8.5' into maint-1.9 * maint-1.8.5: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:27:13 UTC |
| 3d8a54e | Junio C Hamano | 07 January 2015, 21:26:35 UTC | Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5 * jk/dotgit-case-maint-1.8.5: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:26:35 UTC |
| 40d2f38 | Junio C Hamano | 07 January 2015, 21:10:44 UTC | Merge branch 'bw/maint-0090-awk-tweak' * bw/maint-0090-awk-tweak: t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk | 07 January 2015, 21:10:44 UTC |
| 06a8bbb | Junio C Hamano | 07 January 2015, 21:10:40 UTC | Merge branch 'jh/pre-push-sample-no-custom-ifs' The sample pre-push hook used customized IFS=' ' for no good reason. * jh/pre-push-sample-no-custom-ifs: pre-push.sample: remove unnecessary and misleading IFS=' ' | 07 January 2015, 21:10:40 UTC |
