| 3a52578 | Junio C Hamano | 23 March 2015, 18:27:27 UTC | Git 2.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2015, 18:27:27 UTC |
| 437ed4c | Junio C Hamano | 23 March 2015, 18:23:41 UTC | Merge branch 'rs/use-isxdigit' into maint Code cleanup. * rs/use-isxdigit: use isxdigit() for checking if a character is a hexadecimal digit | 23 March 2015, 18:23:41 UTC |
| a393c6b | Junio C Hamano | 23 March 2015, 18:23:37 UTC | Merge branch 'rs/deflate-init-cleanup' into maint Code simplification. * rs/deflate-init-cleanup: zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw} | 23 March 2015, 18:23:38 UTC |
| a4f287e | Junio C Hamano | 23 March 2015, 18:23:35 UTC | Merge branch 'ak/git-done-help-cleanup' into maint Code simplification. * ak/git-done-help-cleanup: git: make was_alias and done_help non-static | 23 March 2015, 18:23:35 UTC |
| 7d6f6e3 | Junio C Hamano | 23 March 2015, 18:23:33 UTC | Merge branch 'sg/completion-remote' into maint Code simplification. * sg/completion-remote: completion: simplify __git_remotes() completion: add a test for __git_remotes() helper function | 23 March 2015, 18:23:33 UTC |
| ffac625 | Junio C Hamano | 23 March 2015, 18:23:30 UTC | Merge branch 'mg/doc-status-color-slot' into maint Documentation fixes. * mg/doc-status-color-slot: config,completion: add color.status.unmerged | 23 March 2015, 18:23:31 UTC |
| 3f6f5c9 | Junio C Hamano | 23 March 2015, 18:23:28 UTC | Merge branch 'jc/decorate-leaky-separator-color' into maint "git log --decorate" did not reset colors correctly around the branch names. * jc/decorate-leaky-separator-color: log --decorate: do not leak "commit" color into the next item Documentation/config.txt: simplify boolean description in the syntax section Documentation/config.txt: describe 'color' value type in the "Values" section Documentation/config.txt: have a separate "Values" section Documentation/config.txt: describe the structure first and then meaning Documentation/config.txt: explain multi-valued variables once Documentation/config.txt: avoid unnecessary negation | 23 March 2015, 18:23:28 UTC |
| c974184 | Junio C Hamano | 23 March 2015, 18:23:25 UTC | Merge branch 'kn/git-cd-to-empty' into maint "git -C '' subcmd" refused to work in the current directory, unlike "cd ''" which silently behaves as a no-op. * kn/git-cd-to-empty: git: treat "git -C '<path>'" as a no-op when <path> is empty | 23 March 2015, 18:23:25 UTC |
| 84a37fa | Junio C Hamano | 23 March 2015, 18:23:22 UTC | Merge branch 'km/imap-send-libcurl-options' into maint "git imap-send" learned to optionally talk with an IMAP server via libcURL; because there is no other option when Git is built with NO_OPENSSL option, use that codepath by default under such configuration. * km/imap-send-libcurl-options: imap-send: use cURL automatically when NO_OPENSSL defined | 23 March 2015, 18:23:23 UTC |
| 82b6e33 | Junio C Hamano | 23 March 2015, 18:23:19 UTC | Merge branch 'mg/verify-commit' into maint Workarounds for certain build of GPG that triggered false breakage in a test. * mg/verify-commit: t7510: do not fail when gpg warns about insecure memory | 23 March 2015, 18:23:20 UTC |
| f63ed08 | Junio C Hamano | 23 March 2015, 18:23:17 UTC | Merge branch 'es/rebase-i-count-todo' into maint "git rebase -i" recently started to include the number of commits in the insn sheet to be processed, but on a platform that prepends leading whitespaces to "wc -l" output, the numbers are shown with extra whitespaces that aren't necessary. * es/rebase-i-count-todo: rebase-interactive: re-word "item count" comment rebase-interactive: suppress whitespace preceding item count | 23 March 2015, 18:23:17 UTC |
| 8c2ea51 | Junio C Hamano | 23 March 2015, 18:23:12 UTC | Merge branch 'tb/connect-ipv6-parse-fix' into maint We did not parse username followed by literal IPv6 address in SSH transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git correctly. * tb/connect-ipv6-parse-fix: t5500: show user name and host in diag-url t5601: add more test cases for IPV6 connect.c: allow ssh://user@[2001:db8::1]/repo.git | 23 March 2015, 18:23:13 UTC |
| bb85775 | Junio C Hamano | 14 March 2015, 05:57:25 UTC | Git 2.3.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2015, 05:57:25 UTC |
| 4b23b5d | Junio C Hamano | 14 March 2015, 05:56:12 UTC | Merge branch 'mr/doc-clean-f-f' into maint Documentation update. * mr/doc-clean-f-f: Documentation/git-clean.txt: document that -f may need to be given twice | 14 March 2015, 05:56:12 UTC |
| 113bc16 | Junio C Hamano | 14 March 2015, 05:56:11 UTC | Merge branch 'ak/t5516-typofix' into maint * ak/t5516-typofix: t5516: correct misspelled pushInsteadOf | 14 March 2015, 05:56:11 UTC |
| bb8f6de | Junio C Hamano | 14 March 2015, 05:56:09 UTC | Merge branch 'jc/diff-test-updates' into maint Test clean-up. * jc/diff-test-updates: test_ln_s_add: refresh stat info of fake symbolic links t4008: modernise style t/diff-lib: check exact object names in compare_diff_raw tests: do not borrow from COPYING and README from the real source t4010: correct expected object names t9300: correct expected object names t4008: correct stale comments | 14 March 2015, 05:56:10 UTC |
| 3aab60b | Junio C Hamano | 14 March 2015, 05:56:08 UTC | Merge branch 'jk/diffcore-rename-duplicate' into maint A corrupt input to "git diff -M" can cause us to segfault. * jk/diffcore-rename-duplicate: diffcore-rename: avoid processing duplicate destinations diffcore-rename: split locate_rename_dst into two functions | 14 March 2015, 05:56:08 UTC |
| ae8ada4 | Junio C Hamano | 14 March 2015, 05:56:07 UTC | Merge branch 'bw/kwset-use-unsigned' into maint The borrowed code in kwset API did not follow our usual convention to use "unsigned char" to store values that range from 0-255. * bw/kwset-use-unsigned: kwset: use unsigned char to store values with high-bit set | 14 March 2015, 05:56:07 UTC |
| 2408f3b | Junio C Hamano | 14 March 2015, 05:56:06 UTC | Merge branch 'nd/grep-exclude-standard-help-fix' into maint Description given by "grep -h" for its --exclude-standard option was phrased poorly. * nd/grep-exclude-standard-help-fix: grep: correct help string for --exclude-standard | 14 March 2015, 05:56:06 UTC |
| 3af1bca | Junio C Hamano | 14 March 2015, 05:56:05 UTC | Merge branch 'mg/doc-remote-tags-or-not' into maint "git remote add" mentioned "--tags" and "--no-tags" and was not clear that fetch from the remote in the future will use the default behaviour when neither is given to override it. * mg/doc-remote-tags-or-not: git-remote.txt: describe behavior without --tags and --no-tags | 14 March 2015, 05:56:05 UTC |
| a4b4f9b | Junio C Hamano | 14 March 2015, 05:56:04 UTC | Merge branch 'mk/diff-shortstat-dirstat-fix' into maint "git diff --shortstat --dirstat=changes" showed a dirstat based on lines that was never asked by the end user in addition to the dirstat that the user asked for. * mk/diff-shortstat-dirstat-fix: diff --shortstat --dirstat: remove duplicate output | 14 March 2015, 05:56:04 UTC |
| 30a52c1 | Junio C Hamano | 14 March 2015, 05:56:03 UTC | Merge branch 'ms/submodule-update-config-doc' into maint The interaction between "git submodule update" and the submodule.*.update configuration was not clearly documented. * ms/submodule-update-config-doc: submodule: improve documentation of update subcommand | 14 March 2015, 05:56:03 UTC |
| 5244a31 | Junio C Hamano | 14 March 2015, 05:56:02 UTC | Merge branch 'jc/apply-beyond-symlink' into maint "git apply" was not very careful about reading from, removing, updating and creating paths outside the working tree (under --index/--cached) or the current directory (when used as a replacement for GNU patch). * jc/apply-beyond-symlink: apply: do not touch a file beyond a symbolic link apply: do not read from beyond a symbolic link apply: do not read from the filesystem under --index apply: reject input that touches outside the working area | 14 March 2015, 05:56:02 UTC |
| 1469d99 | Junio C Hamano | 14 March 2015, 05:56:00 UTC | Merge branch 'rs/daemon-interpolate' into maint "git daemon" looked up the hostname even when "%CH" and "%IP" interpolations are not requested, which was unnecessary. * rs/daemon-interpolate: daemon: use callback to build interpolated path daemon: look up client-supplied hostname lazily | 14 March 2015, 05:56:01 UTC |
| c722ba4 | Junio C Hamano | 14 March 2015, 05:55:59 UTC | Merge branch 'jk/daemon-interpolate' into maint The "interpolated-path" option of "git daemon" inserted any string client declared on the "host=" capability request without checking. Sanitize and limit %H and %CH to a saner and a valid DNS name. * jk/daemon-interpolate: daemon: sanitize incoming virtual hostname t5570: test git-daemon's --interpolated-path option git_connect: let user override virtual-host we send to daemon | 14 March 2015, 05:55:59 UTC |
| 6f75d45 | René Scharfe | 09 March 2015, 22:46:54 UTC | use isxdigit() for checking if a character is a hexadecimal digit Use the standard function isxdigit() to make the intent clearer and avoid using magic constants. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2015, 22:44:41 UTC |
| 0d6accc | Michael J Gruber | 10 March 2015, 16:11:09 UTC | config,completion: add color.status.unmerged Reported-by: "Mladen B." <mladen074@gmail.com> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2015, 22:27:59 UTC |
| 3f88c1b | Kyle J. McKay | 09 March 2015, 20:03:01 UTC | t7510: do not fail when gpg warns about insecure memory Depending on how gpg was built, it may issue the following message to stderr when run: Warning: using insecure memory! When the test is collecting gpg output it is therefore not enough to just match on a "gpg: " prefix it must also match on a "Warning: " prefix wherever it needs to match lines that have been produced by gpg. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Acked-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2015, 22:25:22 UTC |
| dcd01ea | Kyle J. McKay | 08 March 2015, 05:13:55 UTC | imap-send: use cURL automatically when NO_OPENSSL defined If both USE_CURL_FOR_IMAP_SEND and NO_OPENSSL are defined do not force the user to add --curl to get a working git imap-send command. Instead automatically select --curl and warn and ignore the --no-curl option. And while we're in there, correct the warning message when --curl is requested but not supported. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2015, 22:19:05 UTC |
| 6a536e2 | Karthik Nayak | 06 March 2015, 11:18:08 UTC | git: treat "git -C '<path>'" as a no-op when <path> is empty 'git -C ""' unhelpfully dies with error "Cannot change to ''", whereas the shell treats `cd ""' as a no-op. Taking the shell's behavior as a precedent, teach git to treat `-C ""' as a no-op, as well. Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2015, 03:42:00 UTC |
| 1165ae6 | Junio C Hamano | 06 March 2015, 22:58:14 UTC | Git 2.3.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2015, 22:58:14 UTC |
| f69f5f1 | Junio C Hamano | 06 March 2015, 22:57:58 UTC | Merge branch 'rj/no-xopen-source-for-cygwin' into maint Code cleanups. * rj/no-xopen-source-for-cygwin: git-compat-util.h: remove redundant code | 06 March 2015, 22:57:58 UTC |
| f56a5f4 | Junio C Hamano | 06 March 2015, 22:57:57 UTC | Merge branch 'rs/simple-cleanups' into maint Code cleanups. * rs/simple-cleanups: sha1_name: use strlcpy() to copy strings pretty: use starts_with() to check for a prefix for-each-ref: use skip_prefix() to avoid duplicate string comparison connect: use strcmp() for string comparison | 06 March 2015, 22:57:57 UTC |
| d86679f | Junio C Hamano | 06 March 2015, 22:57:56 UTC | Merge branch 'mm/am-c-doc' into maint The configuration variable 'mailinfo.scissors' was hard to discover in the documentation. * mm/am-c-doc: Documentation/git-am.txt: mention mailinfo.scissors config variable Documentation/config.txt: document mailinfo.scissors | 06 March 2015, 22:57:56 UTC |
| 2e7ca27 | Junio C Hamano | 06 March 2015, 22:57:55 UTC | Merge branch 'ew/svn-maint-fixes' into maint Correct a breakage to git-svn around v2.2 era that triggers premature closing of FileHandle. * ew/svn-maint-fixes: Git::SVN::*: avoid premature FileHandle closure git-svn: fix localtime=true on non-glibc environments | 06 March 2015, 22:57:55 UTC |
| e1db59e | Junio C Hamano | 06 March 2015, 22:57:54 UTC | Merge branch 'km/send-email-getopt-long-workarounds' into maint Even though we officially haven't dropped Perl 5.8 support, the Getopt::Long package that came with it does not support "--no-" prefix to negate a boolean option; manually add support to help people with older Getopt::Long package. * km/send-email-getopt-long-workarounds: git-send-email.perl: support no- prefix with older GetOptions | 06 March 2015, 22:57:54 UTC |
| 53e53c7 | SZEDER Gábor | 04 March 2015, 14:10:29 UTC | completion: simplify __git_remotes() The __git_remotes() helper function lists the remotes from the config file by processing the output of a 'git config' query. A simple 'git remote' produces the exact same output, so run that instead. Remotes under '$GIT_DIR/remotes' are still listed by running 'ls -1', because 'git remote' unfortunately ignores them. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2015, 20:48:02 UTC |
| 2acc194 | SZEDER Gábor | 04 March 2015, 14:10:28 UTC | completion: add a test for __git_remotes() helper function The test checks that both remotes under '$GIT_DIR/remotes' and remotes in the config file are listed. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2015, 20:48:00 UTC |
| 2185d3b | Eric Sunshine | 04 March 2015, 07:53:05 UTC | rebase-interactive: re-word "item count" comment 97f05f43 (Show number of TODO items for interactive rebase, 2014-12-10) taught rebase-interactive to display an item count in the instruction list comments: # Rebase 46640c6..5568fd5 onto 46640c6 (4 TODO item(s)) # # Commands: # p, pick = use commit # ... However, with the exception of the --edit-todo option, "TODO" is a one-off term, never presented to the user by rebase-interactive in any other context. The item count is in fact the number of commands ("pick", "edit", etc.) remaining on the instruction sheet, and the comment immediately following it talks about "Commands". Consequently, replace "(# TODO item(s))" with the more accurate and meaningful "(# command(s))". Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2015, 20:25:33 UTC |
| 28c8cfc | Eric Sunshine | 04 March 2015, 07:53:04 UTC | rebase-interactive: suppress whitespace preceding item count 97f05f43 (Show number of TODO items for interactive rebase, 2014-12-10) taught rebase-interactive to compute an item count with 'wc -l' and display it in the instruction list comments: # Rebase 46640c6..5568fd5 onto 46640c6 (4 TODO item(s)) On Mac OS X, however, it renders as: # Rebase 46640c6..5568fd5 onto 46640c6 ( 4 TODO item(s)) since 'wc -l' indents its output with leading spaces. Fix this. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2015, 20:11:27 UTC |
| 8fa7975 | Alexander Kuleshov | 02 March 2015, 12:02:37 UTC | git: make was_alias and done_help non-static 'was_alias' variable does not need to store it's value on each iteration in the loop; this variable gets assigned the result of run_argv() every time in the loop before being used. 'done_help' variable does not need to be static variable too if we move it out the loop. Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2015, 20:03:30 UTC |
| 9a6f128 | René Scharfe | 05 March 2015, 22:49:46 UTC | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw} Clear the git_zstream variable at the start of git_deflate_init() etc. so that callers don't have to do that. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2015, 23:46:03 UTC |
| 3ebda3e | Junio C Hamano | 05 March 2015, 21:15:53 UTC | Prepare for 2.3.2 | 05 March 2015, 21:15:53 UTC |
| 1e299f5 | Junio C Hamano | 05 March 2015, 21:13:13 UTC | Merge branch 'sb/plug-leak-in-make-cache-entry' into maint "update-index --refresh" used to leak when an entry cannot be refreshed for whatever reason. * sb/plug-leak-in-make-cache-entry: read-cache.c: free cache entry when refreshing fails | 05 March 2015, 21:13:14 UTC |
| 4e0d620 | Junio C Hamano | 05 March 2015, 21:13:12 UTC | Merge branch 'jk/fast-import-die-nicely-fix' into maint "git fast-import" used to crash when it could not close and conclude the resulting packfile cleanly. * jk/fast-import-die-nicely-fix: fast-import: avoid running end_packfile recursively | 05 March 2015, 21:13:13 UTC |
| 007f7f6 | Junio C Hamano | 05 March 2015, 21:13:12 UTC | Merge branch 'es/blame-commit-info-fix' into maint "git blame" died, trying to free an uninitialized piece of memory. * es/blame-commit-info-fix: builtin/blame: destroy initialized commit_info only | 05 March 2015, 21:13:12 UTC |
| 3336757 | Junio C Hamano | 05 March 2015, 21:13:10 UTC | Merge branch 'ab/merge-file-prefix' into maint "git merge-file" did not work correctly in a subdirectory. * ab/merge-file-prefix: merge-file: correctly open files when in a subdir | 05 March 2015, 21:13:11 UTC |
| 3630be2 | Junio C Hamano | 05 March 2015, 21:13:09 UTC | Merge branch 'ps/submodule-sanitize-path-upon-add' into maint "git submodule add" failed to squash "path/to/././submodule" to "path/to/submodule". * ps/submodule-sanitize-path-upon-add: git-submodule.sh: fix '/././' path normalization | 05 March 2015, 21:13:10 UTC |
| cbc8d6d | Junio C Hamano | 05 March 2015, 21:13:08 UTC | Merge branch 'jk/prune-mtime' into maint In v2.2.0, we broke "git prune" that runs in a repository that borrows from an alternate object store. * jk/prune-mtime: sha1_file: fix iterating loose alternate objects for_each_loose_file_in_objdir: take an optional strbuf path | 05 March 2015, 21:13:08 UTC |
| f5a191d | Junio C Hamano | 05 March 2015, 21:13:07 UTC | Merge branch 'tc/curl-vernum-output-broken-in-7.11' into maint Certain older vintages of cURL give irregular output from "curl-config --vernum", which confused our build system. * tc/curl-vernum-output-broken-in-7.11: Makefile: handle broken curl version number in version check | 05 March 2015, 21:13:07 UTC |
| e591339 | Junio C Hamano | 05 March 2015, 21:13:06 UTC | Merge branch 'es/squelch-openssl-warnings-on-macosx' into maint An earlier workaround to squelch unhelpful deprecation warnings from the complier on Mac OSX unnecessarily set minimum required version of the OS, which the user might want to raise (or lower) for other reasons. * es/squelch-openssl-warnings-on-macosx: git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED | 05 March 2015, 21:13:07 UTC |
| c11c154 | Junio C Hamano | 05 March 2015, 21:13:05 UTC | Merge branch 'jc/conf-var-doc' into maint Longstanding configuration variable naming rules has been added to the documentation. * jc/conf-var-doc: CodingGuidelines: describe naming rules for configuration variables config.txt: mark deprecated variables more prominently config.txt: clarify that add.ignore-errors is deprecated | 05 March 2015, 21:13:05 UTC |
| 518d1c3 | Junio C Hamano | 05 March 2015, 21:13:04 UTC | Merge branch 'av/wincred-with-at-in-username-fix' into maint The credential helper for Windows (in contrib/) used to mishandle a user name with an at-sign in it. * av/wincred-with-at-in-username-fix: wincred: fix get credential if username has "@" | 05 March 2015, 21:13:04 UTC |
| ab09f58 | Junio C Hamano | 05 March 2015, 21:13:03 UTC | Merge branch 'ch/new-gpg-drops-rfc-1991' into maint Older GnuPG implementations may not correctly import the keyring material we prepare for the tests to use. * ch/new-gpg-drops-rfc-1991: t/lib-gpg: sanity-check that we can actually sign t/lib-gpg: include separate public keys in keyring.gpg | 05 March 2015, 21:13:04 UTC |
| 069dea8 | Junio C Hamano | 05 March 2015, 21:13:03 UTC | Merge branch 'jc/remote-set-url-doc' into maint Clarify in the documentation that "remote.<nick>.pushURL" and "remote.<nick>.URL" are there to name the same repository accessed via different transports, not two separate repositories. * jc/remote-set-url-doc: Documentation/git-remote.txt: stress that set-url is not for triangular | 05 March 2015, 21:13:03 UTC |
| abfed73 | Junio C Hamano | 05 March 2015, 21:13:02 UTC | Merge branch 'jk/pack-bitmap' into maint The pack bitmap support did not build with older versions of GCC. * jk/pack-bitmap: ewah: fix building with gcc < 3.4.0 | 05 March 2015, 21:13:02 UTC |
| 2250406 | Junio C Hamano | 05 March 2015, 21:13:00 UTC | Merge branch 'jk/config-no-ungetc-eof' into maint Reading configuration from a blob object, when it ends with a lone CR, use to confuse the configuration parser. * jk/config-no-ungetc-eof: config_buf_ungetc: warn when pushing back a random character config: do not ungetc EOF | 05 March 2015, 21:13:00 UTC |
| 3bef3c1 | Junio C Hamano | 05 March 2015, 21:12:59 UTC | Merge branch 'jk/decimal-width-for-uintmax' into maint We didn't format an integer that wouldn't fit in "int" but in "uintmax_t" correctly. * jk/decimal-width-for-uintmax: decimal_width: avoid integer overflow | 05 March 2015, 21:12:59 UTC |
| b1cffbf | Junio C Hamano | 05 March 2015, 21:12:58 UTC | Merge branch 'jc/push-cert' into maint "git push --signed" gave an incorrectly worded error message when the other side did not support the capability. * jc/push-cert: transport-helper: fix typo in error message when --signed is not supported | 05 March 2015, 21:12:58 UTC |
| 6db0497 | Junio C Hamano | 05 March 2015, 21:12:57 UTC | Merge branch 'mh/deref-symref-over-helper-transport' into maint "git fetch" over a remote-helper that cannot respond to "list" command could not fetch from a symbolic reference e.g. HEAD. * mh/deref-symref-over-helper-transport: transport-helper: do not request symbolic refs to remote helpers | 05 March 2015, 21:12:57 UTC |
| aaa90f5 | Junio C Hamano | 05 March 2015, 21:12:56 UTC | Merge branch 'ks/rebase-i-abbrev' into maint The insn sheet "git rebase -i" creates did not fully honor core.abbrev settings. * ks/rebase-i-abbrev: rebase -i: use full object name internally throughout the script | 05 March 2015, 21:12:56 UTC |
| be2804c | Junio C Hamano | 05 March 2015, 21:12:55 UTC | Merge branch 'dp/remove-duplicated-header-inclusion' into maint Code clean-up. * dp/remove-duplicated-header-inclusion: do not include the same header twice | 05 March 2015, 21:12:55 UTC |
| 552f699 | Junio C Hamano | 05 March 2015, 21:12:54 UTC | Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maint Code clean-up. * sb/hex-object-name-is-at-most-41-bytes-long: hex.c: reduce memory footprint of sha1_to_hex static buffers | 05 March 2015, 21:12:55 UTC |
| a628d50 | Junio C Hamano | 05 March 2015, 21:12:53 UTC | Merge branch 'ak/git-pm-typofix' into maint Typofix in comments. * ak/git-pm-typofix: Git.pm: two minor typo fixes | 05 March 2015, 21:12:53 UTC |
| 8fd37b3 | Junio C Hamano | 05 March 2015, 21:12:52 UTC | Merge branch 'jk/sanity' into maint The tests that wanted to see that file becomes unreadable after running "chmod a-r file", and the tests that wanted to make sure it is not run as root, we used "can we write into the / directory?" as a cheap substitute, but on some platforms that is not a good heuristics. The tests and their prerequisites have been updated to check what they really require. * jk/sanity: test-lib.sh: set prerequisite SANITY by testing what we really need tests: correct misuses of POSIXPERM t/lib-httpd: switch SANITY check for NOT_ROOT | 05 March 2015, 21:12:52 UTC |
| 5ee8758 | Junio C Hamano | 04 March 2015, 19:07:12 UTC | log --decorate: do not leak "commit" color into the next item In "git log --decorate", you would see the commit header like this: commit ... (HEAD, jc/decorate-leaky-separator-color) where "commit ... (" is painted in color.diff.commit, "HEAD" in color.decorate.head, ", " in color.diff.commit, the branch name in color.decorate.branch and then closing ")" in color.diff.commit. If you wanted to paint the HEAD and local branch name in the same color as the body text (perhaps because cyan and green are too faint on a black-on-white terminal to be readable), you would not want to have to say [color "decorate"] head = black branch = black because that you would not be able to reuse same configuration on a white-on-black terminal. You would naively expect [color "decorate"] head = normal branch = normal to work, but unfortunately it does not. It paints the string "HEAD" and the branch name in the same color as the opening parenthesis or comma between the decoration elements. This is because the code forgets to reset the color after printing the "prefix" in its own color. It theoretically is possible that some people were expecting and relying on that the attribute set as the "diff.commit" color, which is used to draw these opening parenthesis and inter-item comma, is inherited by the drawing of branch names, but it is not how the coloring works everywhere else. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2015, 19:42:35 UTC |
| 1c448b3 | Junio C Hamano | 04 March 2015, 19:08:34 UTC | Documentation/config.txt: simplify boolean description in the syntax section The 'true' short-hand doesn't deserve a separate sentence; even our own git config --bool foo.bar yes would not produce it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2015, 19:42:34 UTC |
| b92c1a2 | Junio C Hamano | 04 March 2015, 07:07:13 UTC | Documentation/config.txt: describe 'color' value type in the "Values" section Instead of describing it for color.branch.<slot> and have everybody else refer to it, explain how colors are spelled in "Values" section upfront. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2015, 19:42:34 UTC |
| 5f7b91b | Junio C Hamano | 04 March 2015, 18:57:43 UTC | Documentation/config.txt: have a separate "Values" section The various types of values set to the configuration variables deserve more than a brief footnote mention in the syntax section, and it will be more so after the later steps of this clean up effort. Move the mention of booleans from the syntax section to this new section, and describe how human-readble integers can be spelled with scaling there. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2015, 19:42:34 UTC |
| ff5507e | Junio C Hamano | 04 March 2015, 18:33:38 UTC | Documentation/config.txt: describe the structure first and then meaning A line can be continued via a backquote-LF and can be chomped at a comment character. But that is not specific to string-typed values. It is common to all, just like unquoted leading and trailing whitespaces are stripped and inter-word spacing are retained. Move the description around and desribe these structural rules first, then introduce the double-quote facility as a way to override them, and finally mention various types of values. Note that these structural rules only apply to the value part of the configuration file. E.g. [aSection] \ name \ = value does not work, because the rules kick in only after seeing "name =". Both the original and the updated text are phrased in an awkward way by singling out the "value" part of the line because of this. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2015, 19:42:34 UTC |
| a5285b6 | Junio C Hamano | 04 March 2015, 18:26:17 UTC | Documentation/config.txt: explain multi-valued variables once The syntax section repeats what the preamble explained already. That a variable can have multiple values is more about what a variable is than the syntax of the file. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2015, 19:42:34 UTC |
| 05c3e5c | Junio C Hamano | 04 March 2015, 04:03:50 UTC | Documentation/config.txt: avoid unnecessary negation Section names and variable names are both case-insensitive, but one is described as "not case sensitive". Use "case-insensitive" for both. Instead of saying "... have to be escaped" without telling what that escaping achieves, state it in a more positive way, i.e. "... can be included by escaping". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2015, 19:42:33 UTC |
| eb32c66 | Anders Kaseorg | 01 March 2015, 04:18:14 UTC | t5516: correct misspelled pushInsteadOf A future breakage to "git push" to make it incorrectly pay attention to pushInsteadOf when it should not will be left uncaught without this change. Signed-off-by: Anders Kaseorg <andersk@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2015, 20:07:18 UTC |
| 5c31acf | Michal Sojka | 02 March 2015, 22:57:58 UTC | submodule: improve documentation of update subcommand The documentation of 'git submodule update' has several problems: 1) It mentions that value 'none' of submodule.$name.update can be overridden by --checkout, but other combinations of configuration values and command line options are not mentioned. 2) The documentation of submodule.$name.update is scattered across three places, which is confusing. 3) The documentation of submodule.$name.update in gitmodules.txt is incorrect, because the code always uses the value from .git/config and never from .gitmodules. 4) Documentation of --force was incomplete, because it is only effective in case of checkout method of update. Fix all these problems by documenting submodule.*.update in git-submodule.txt and make everybody else refer to it. Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2015, 22:59:55 UTC |
| aaba0ab | Michael J Gruber | 02 March 2015, 13:08:09 UTC | git-remote.txt: describe behavior without --tags and --no-tags Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2015, 20:48:23 UTC |
| 189c860 | Ben Walton | 02 March 2015, 19:22:31 UTC | kwset: use unsigned char to store values with high-bit set Sun Studio on Solaris issues warnings about improper initialization values being used when defining tolower_trans_tbl[] in ctype.c. The array wants to store values with high-bit set and treat them as values between 128 to 255. Unlike the rest of the Git codebase where we explicitly specify 'unsigned char' for such variables and arrays, however, kwset code we borrowed from elsewhere uses 'char' for this and other variables. Fix the declarations to explicitly use 'unsigned char' where necessary to bring it in line with the rest of the Git. Signed-off-by: Ben Walton <bdwalton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2015, 20:32:24 UTC |
| ab27389 | Mårten Kongstad | 02 March 2015, 15:05:39 UTC | diff --shortstat --dirstat: remove duplicate output When --shortstat is used in conjunction with --dirstat=changes, git diff will output the dirstat information twice: first as calculated by the 'lines' algorithm, then as calculated by the 'changes' algorithm: $ git diff --dirstat=changes,10 --shortstat v2.2.0..v2.2.1 23 files changed, 453 insertions(+), 54 deletions(-) 33.5% Documentation/RelNotes/ 26.2% t/ 46.6% Documentation/RelNotes/ 16.6% t/ The same duplication happens for --shortstat together with --dirstat=files, but not for --shortstat together with --dirstat=lines. Limit output to only include one dirstat part, calculated as specified by the --dirstat parameter. Also, add test for this. Signed-off-by: Mårten Kongstad <marten.kongstad@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2015, 19:31:27 UTC |
| 4d6be03 | Jeff King | 27 February 2015, 01:42:27 UTC | diffcore-rename: avoid processing duplicate destinations The rename code cannot handle an input where we have duplicate destinations (i.e., more than one diff_filepair in the queue with the same string in its pair->two->path). We end up allocating only one slot in the rename_dst mapping. If we fill in the diff_filepair for that slot, when we re-queue the results, we may queue that filepair multiple times. When the diff is finally flushed, the filepair is processed and free()d multiple times, leading to heap corruption. This situation should only happen when a tree diff sees duplicates in one of the trees (see the added test for a detailed example). Rather than handle it, the sanest thing is just to turn off rename detection altogether for the diff. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2015, 21:41:29 UTC |
| f98c2f7 | Jeff King | 27 February 2015, 01:39:48 UTC | diffcore-rename: split locate_rename_dst into two functions This function manages the mapping of destination pathnames to filepairs, and it handles both insertion and lookup. This makes the return value a bit confusing, as we return a newly created entry (even though no caller cares), and have no room to indicate to the caller that an entry already existed. Instead, let's break this up into two distinct functions, both backed by a common binary search. The binary search will use our normal "return the index if we found something, or negative index minus one to show where it would have gone" semantics. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2015, 21:41:21 UTC |
| 77fdb8a | Nguyễn Thái Ngọc Duy | 27 February 2015, 14:01:58 UTC | grep: correct help string for --exclude-standard The current help string is about --no-exclude-standard. But "git grep -h" would show --exclude-standard instead. Flip the string. See 0a93fb8 (grep: teach --untracked and --exclude-standard options - 2011-09-27) for more info about these options. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2015, 20:22:41 UTC |
| e426311 | Kyle J. McKay | 26 February 2015, 13:49:34 UTC | Git::SVN::*: avoid premature FileHandle closure Since b19138b (git-svn: Make it incrementally faster by minimizing temp files, v1.6.0), git-svn has been using the Git.pm temp_acquire and temp_release mechanism to avoid unnecessary temp file churn and provide a speed boost. However, that change introduced a call to temp_acquire inside the Git::SVN::Fetcher::close_file function for an 'svn_hash' temp file. Because an SVN::Pool is active at the time this function is called, if the Git::temp_acquire function ends up actually creating a new FileHandle for the temp file (which it will the first time it's called with the name 'svn_hash') that FileHandle will end up in the SVN::Pool and should that pool have SVN::Pool::clear called on it that FileHandle will be closed out from under Git::temp_acquire. Since the only call site to Git::temp_acquire with the name 'svn_hash' is inside the close_file function, if an 'svn_hash' temp file is ever created its FileHandle is guaranteed to be created in the active SVN::Pool. This has not been a problem in the past because the SVN::Pool was not being cleared. However, since dfa72fdb (git-svn: reload RA every log-window-size, v2.2.0) the pool has been getting cleared periodically at which point the FileHandle for the 'svn_hash' temp file gets closed. Any subsequent calls to Git::temp_acquire for 'svn_hash', however, succeed without creating/opening a new temporary file since it still has the now invalid FileHandle in its cache. Callers that then attempt to use that FileHandle fail with an error. We avoid this problem by making sure the 'svn_hash' temp file is created in the same place the 'svn_delta_...' and 'git_blob_...' temp files are (and then temp_release'd) so that it can be safely used inside the close_file function without having its FileHandle end up in an SVN::Pool that gets cleared. Additionally the Git.pm cat_blob function creates a bidirectional pipe FileHandle using the IPC::Open2::open2 function. If that handle is created too late, it also gets caught up in the SVN::Pool and incorrectly closed by the SVN::Pool::clear call. But this only seems to happen with more recent versions of Perl and svn. To avoid this problem we add an explicit call to _open_cat_blob_if_needed before the first call to SVN::Pool->new_default to make sure the open2 handle does not end up in the SVN::Pool. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2015, 22:02:34 UTC |
| 45c956b | Ryuichi Kokubo | 25 February 2015, 16:04:41 UTC | git-svn: fix localtime=true on non-glibc environments git svn uses POSIX::strftime('%s', $sec, $min, ...) to make unix epoch time. But lowercase %s formatting character is a GNU extention. This causes problem in git svn fetch --localtime on non-glibc systems, such as msys or cygwin. Using Time::Local::timelocal($sec, $min, ...) fixes it. Signed-off-by: Ryuichi Kokubo <ryu1kkb@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Notes: lowercase %s format character in strftime is a GNU extension and not widely supported. POSIX::strftime affected by underlying crt's strftime because POSIX::strftime just calls crt's one. Time::Local is good function to replace POSIX::strftime because it's a perl core module function. Document about Time::Local. http://perldoc.perl.org/Time/Local.html These are specifications of strftime. The GNU C Library Reference Manual. http://www.gnu.org/software/libc/manual/html_node/Formatting-Calendar-Time.html perl POSIX module's strftime document. It does not have '%s'. http://perldoc.perl.org/POSIX.html strftime document of Microsort Windows C Run-Time library. https://msdn.microsoft.com/en-us/library/fe06s4ak.aspx The Open Group's old specification does not have '%s' too. http://pubs.opengroup.org/onlinepubs/007908799/xsh/strftime.html On my environment, following problems happened. - msys : git svn fetch does not progress at all with perl.exe consuming CPU. - cygwin : git svn fetch progresses but time stamp information is dropped. Every commits have unix epoch timestamp. I would like to thank git developer and contibutors. git helps me so much everyday. Thank you. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2015, 22:02:34 UTC |
| bcd57cb | Mikko Rapeli | 26 February 2015, 13:16:49 UTC | Documentation/git-clean.txt: document that -f may need to be given twice This is needed in build automation where the tree really needs to be reset to known state. Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2015, 21:10:40 UTC |
| 8004647 | Junio C Hamano | 25 February 2015, 06:14:42 UTC | Git 2.3.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2015, 06:14:42 UTC |
| 7bc4c01 | Junio C Hamano | 25 February 2015, 06:10:42 UTC | Merge branch 'ak/add-i-empty-candidates' into maint The interactive "show a list and let the user choose from it" interface "add -i" used showed and prompted to the user even when the candidate list was empty, against which the only "choice" the user could have made was to choose nothing. * ak/add-i-empty-candidates: add -i: return from list_and_choose if there is no candidate | 25 February 2015, 06:10:42 UTC |
| 2764442 | Junio C Hamano | 25 February 2015, 06:10:41 UTC | Merge branch 'jc/apply-ws-fix-expands' into maint "git apply --whitespace=fix" used to under-allocate the memory when the fix resulted in a longer text than the original patch. * jc/apply-ws-fix-expands: apply: count the size of postimage correctly apply: make update_pre_post_images() sanity check the given postlen apply.c: typofix | 25 February 2015, 06:10:41 UTC |
| 254a3eb | Junio C Hamano | 25 February 2015, 06:10:39 UTC | Merge branch 'jc/doc-log-rev-list-options' into maint "git log --help" used to show rev-list options that are irrelevant to the "log" command. * jc/doc-log-rev-list-options: Documentation: what does "git log --indexed-objects" even mean? | 25 February 2015, 06:10:40 UTC |
| 7070c03 | Junio C Hamano | 25 February 2015, 06:10:38 UTC | Merge branch 'mg/commit-author-no-match-malformed-message' into maint The error message from "git commit", when a non-existing author name was given as value to the "--author=" parameter, has been reworded to avoid misunderstanding. * mg/commit-author-no-match-malformed-message: commit: reword --author error message | 25 February 2015, 06:10:38 UTC |
| 117c1b3 | Junio C Hamano | 25 February 2015, 06:10:37 UTC | Merge branch 'jk/dumb-http-idx-fetch-fix' into maint A broken pack .idx file in the receiving repository prevented the dumb http transport from fetching a good copy of it from the other side. * jk/dumb-http-idx-fetch-fix: dumb-http: do not pass NULL path to parse_pack_index | 25 February 2015, 06:10:37 UTC |
| 9f8410b | Junio C Hamano | 25 February 2015, 06:10:36 UTC | Merge branch 'jc/diff-format-doc' into maint The documentation incorrectly said that C(opy) and R(ename) are the only ones that can be followed by the score number in the output in the --raw format. * jc/diff-format-doc: diff-format doc: a score can follow M for rewrite | 25 February 2015, 06:10:36 UTC |
| b9efce1 | Junio C Hamano | 25 February 2015, 06:10:35 UTC | Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint Fix a misspelled conditional that is always true. * jk/remote-curl-an-array-in-struct-cannot-be-null: do not check truth value of flex arrays | 25 February 2015, 06:10:35 UTC |
| 93baadb | Junio C Hamano | 25 February 2015, 06:10:21 UTC | Merge branch 'jk/status-read-branch-name-fix' into maint Code to read branch name from various files in .git/ directory would have misbehaved if the code to write them left an empty file. * jk/status-read-branch-name-fix: read_and_strip_branch: fix typo'd address-of operator | 25 February 2015, 06:10:22 UTC |
| 2fc85f0 | Junio C Hamano | 25 February 2015, 06:10:19 UTC | Merge branch 'mg/push-repo-option-doc' into maint The "git push" documentation made the "--repo=<there>" option easily misunderstood. * mg/push-repo-option-doc: git-push.txt: document the behavior of --repo | 25 February 2015, 06:10:19 UTC |
| 8f3d03d | Junio C Hamano | 25 February 2015, 06:10:17 UTC | Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maint After attempting and failing a password-less authentication (e.g. kerberos), libcURL refuses to fall back to password based Basic authentication without a bit of help/encouragement. * bc/http-fallback-to-password-after-krb-fails: remote-curl: fall back to Basic auth if Negotiate fails | 25 February 2015, 06:10:17 UTC |
| 6606129 | Junio C Hamano | 25 February 2015, 06:10:15 UTC | Merge branch 'dk/format-patch-ignore-diff-submodule' into maint Setting diff.submodule to 'log' made "git format-patch" produce broken patches. * dk/format-patch-ignore-diff-submodule: format-patch: ignore diff.submodule setting t4255: test am submodule with diff.submodule | 25 February 2015, 06:10:15 UTC |
| 74419c2 | Junio C Hamano | 25 February 2015, 06:10:13 UTC | Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint "git rerere" (invoked internally from many mergy operations) did not correctly signal errors when told to update the working tree files and failed to do so for whatever reason. * jn/rerere-fail-on-auto-update-failure: rerere: error out on autoupdate failure | 25 February 2015, 06:10:13 UTC |
| faf723a | Junio C Hamano | 25 February 2015, 06:09:54 UTC | Merge branch 'jk/blame-commit-label' into maint "git blame HEAD -- missing" failed to correctly say "HEAD" when it tried to say "No such path 'missing' in HEAD". * jk/blame-commit-label: blame.c: fix garbled error message use xstrdup_or_null to replace ternary conditionals builtin/commit.c: use xstrdup_or_null instead of envdup builtin/apply.c: use xstrdup_or_null instead of null_strdup git-compat-util: add xstrdup_or_null helper | 25 February 2015, 06:09:54 UTC |
| 817d03e | Johannes Sixt | 23 February 2015, 18:14:47 UTC | test_ln_s_add: refresh stat info of fake symbolic links We have a helper function test_ln_s_add that inserts a symbolic link into the index even if the file system does not support symbolic links. There is a small flaw in the emulation path: the added entry does not pick up stat information of the fake symbolic link from the file system, as a consequence, the index is not exactly the same as for the "regular" path (where symbolic links are available). To fix this, just call git update-index again. This flaw was revealed by the earlier change that tightened compare_diff_raw(), because a test case in t4008 depends on the correctly updated index. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2015, 19:45:39 UTC |
| 33baa69 | Ramsay Jones | 23 February 2015, 00:07:14 UTC | git-compat-util.h: remove redundant code Since commit 3a0a3a89 ("git-compat-util.h: don't define _XOPEN_SOURCE on cygwin", 23-11-2014) removed the definition of _XOPEN_SOURCE on cygwin, the code within a pre-processor conditional further down the file became redundant. Remove the redundant code. This effectively reverts commit 41b20017 ("Fix an "implicit function definition" warning", 03-03-2007). Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2015, 02:56:23 UTC |
| 3f55cca | Torsten Bögershausen | 21 February 2015, 15:52:55 UTC | t5500: show user name and host in diag-url The URL for ssh may have include a username before the hostname, like ssh://user@host/repo. When literal IPV6 addresses are used together with a username, the substring "user@[::1]" must be converted into "user@::1". Make that conversion visible for the user, and write userandhost in the diagnostics Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2015, 20:04:01 UTC |
