| 21ccbd3 | Ryan Nowakowski | 20 June 2014, 18:37:53 UTC | Better push error | 20 June 2014, 18:37:53 UTC |
| cb682f8 | Junio C Hamano | 16 June 2014, 19:39:35 UTC | Third batch for 2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 June 2014, 19:39:35 UTC |
| 7e1a538 | Junio C Hamano | 16 June 2014, 19:18:56 UTC | Merge branch 'ib/test-selectively-run' Allow specifying only certain individual test pieces to be run using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'"). * ib/test-selectively-run: t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests test-lib: '--run' to run only specific tests test-lib: tests skipped by GIT_SKIP_TESTS say so test-lib: document short options in t/README | 16 June 2014, 19:18:56 UTC |
| c6d3abb | Junio C Hamano | 16 June 2014, 19:18:55 UTC | Merge branch 'ta/string-list-init' * ta/string-list-init: string-list: spell all values out that are given to a string_list initializer | 16 June 2014, 19:18:55 UTC |
| bbfa0cc | Junio C Hamano | 16 June 2014, 19:18:54 UTC | Merge branch 'jm/dedup-test-config' * jm/dedup-test-config: t/t7810-grep.sh: remove duplicate test_config() | 16 June 2014, 19:18:54 UTC |
| ae7dd1a | Junio C Hamano | 16 June 2014, 19:18:52 UTC | Merge branch 'dt/refs-check-refname-component-optim' * dt/refs-check-refname-component-optim: refs.c: optimize check_refname_component() | 16 June 2014, 19:18:52 UTC |
| c651ccc | Junio C Hamano | 16 June 2014, 19:18:50 UTC | Merge branch 'sk/test-cmp-bin' * sk/test-cmp-bin: t5000, t5003: do not use test_cmp to compare binary files | 16 June 2014, 19:18:51 UTC |
| 96b29bd | Junio C Hamano | 16 June 2014, 19:18:49 UTC | Merge branch 'sh/enable-preloadindex' * sh/enable-preloadindex: environment.c: enable core.preloadindex by default | 16 June 2014, 19:18:49 UTC |
| bb0ced7 | Junio C Hamano | 16 June 2014, 19:18:48 UTC | Merge branch 'rs/read-ref-at' * rs/read-ref-at: refs.c: change read_ref_at to use the reflog iterators | 16 June 2014, 19:18:48 UTC |
| d0d5ba7 | Junio C Hamano | 16 June 2014, 19:18:47 UTC | Merge branch 'jk/error-resolve-conflict-advice' * jk/error-resolve-conflict-advice: error_resolve_conflict: drop quotations around operation error_resolve_conflict: rewrap advice message | 16 June 2014, 19:18:47 UTC |
| 57a2eee | Junio C Hamano | 16 June 2014, 19:18:42 UTC | Merge branch 'rs/pack-objects-no-unnecessary-realloc' Avoid unnecessary copy of previous contents when extending the hashtable used in pack-objects. * rs/pack-objects-no-unnecessary-realloc: pack-objects: use free()+xcalloc() instead of xrealloc()+memset() | 16 June 2014, 19:18:42 UTC |
| 3009afd | Junio C Hamano | 16 June 2014, 19:18:41 UTC | Merge branch 'lt/log-auto-decorate' * lt/log-auto-decorate: git log: support "auto" decorations | 16 June 2014, 19:18:41 UTC |
| 668668a | Junio C Hamano | 16 June 2014, 19:18:39 UTC | Merge branch 'jm/doc-wording-tweaks' * jm/doc-wording-tweaks: Documentation: wording fixes in the user manual and glossary | 16 June 2014, 19:18:39 UTC |
| f18871d | Junio C Hamano | 16 June 2014, 19:18:38 UTC | Merge branch 'jm/format-patch-mail-sig' * jm/format-patch-mail-sig: format-patch: add "--signature-file=<file>" option format-patch: make newline after signature conditional | 16 June 2014, 19:18:38 UTC |
| 2075a0c | Junio C Hamano | 16 June 2014, 19:18:35 UTC | Merge branch 'jk/http-errors' Propagate the error messages from the webserver better to the client coming over the HTTP transport. * jk/http-errors: http: default text charset to iso-8859-1 remote-curl: reencode http error messages strbuf: add strbuf_reencode helper http: optionally extract charset parameter from content-type http: extract type/subtype portion of content-type t5550: test display of remote http error messages t/lib-httpd: use write_script to copy CGI scripts test-lib: preserve GIT_CURL_VERBOSE from the environment | 16 June 2014, 19:18:36 UTC |
| c37d326 | Junio C Hamano | 16 June 2014, 19:18:24 UTC | Merge branch 'ow/config-mailmap-pathname' mailmap.file configuration names a pathname, hence should honor ~/path and ~user/path as its value. * ow/config-mailmap-pathname: config: respect '~' and '~user' in mailmap.file | 16 June 2014, 19:18:24 UTC |
| c9fc3a6 | Junio C Hamano | 16 June 2014, 19:18:15 UTC | Merge branch 'fc/remote-helper-refmap' Allow remote-helper/fast-import based transport to rename the refs while transferring the history. * fc/remote-helper-refmap: transport-helper: remove unnecessary strbuf resets transport-helper: add support to delete branches fast-export: add support to delete refs fast-import: add support to delete refs transport-helper: add support to push symbolic refs transport-helper: add support for old:new refspec fast-export: add new --refspec option fast-export: improve argument parsing | 16 June 2014, 19:18:15 UTC |
| 1a81f6c | Junio C Hamano | 16 June 2014, 19:18:12 UTC | Merge branch 'nd/daemonize-gc' "git gc --auto" was recently changed to run in the background to give control back early to the end-user sitting in front of the terminal, but it forgot that housekeeping involving reflogs should be done without other processes competing for accesses to the refs. * nd/daemonize-gc: gc --auto: do not lock refs in the background | 16 June 2014, 19:18:12 UTC |
| 8dbd313 | Junio C Hamano | 16 June 2014, 19:18:09 UTC | Merge branch 'jm/t9138-style-fix' * jm/t9138-style-fix: t9138-git-svn-authors-prog.sh fixups | 16 June 2014, 19:18:09 UTC |
| bf2941b | Junio C Hamano | 16 June 2014, 19:18:06 UTC | Merge branch 'jm/instaweb-apache-24' * jm/instaweb-apache-24: git-instaweb: add support for Apache 2.4 | 16 June 2014, 19:18:06 UTC |
| 474df92 | Junio C Hamano | 16 June 2014, 19:17:58 UTC | Merge branch 'jl/remote-rm-prune' "git remote rm" and "git remote prune" can involve removing many refs at once, which is not a very efficient thing to do when very many refs exist in the packed-refs file. * jl/remote-rm-prune: remote prune: optimize "dangling symref" check/warning remote: repack packed-refs once when deleting multiple refs remote rm: delete remote configuration as the last | 16 June 2014, 19:17:58 UTC |
| 5cf2c57 | Junio C Hamano | 16 June 2014, 19:17:53 UTC | Merge branch 'jk/complete-merge-pull' The completion code did not know about quite a few options that are common between "git merge" and "git pull", and a couple of options unique to "git merge". * jk/complete-merge-pull: completion: add missing options for git-merge completion: add a note that merge options are shared | 16 June 2014, 19:17:53 UTC |
| a634a6d | Junio C Hamano | 16 June 2014, 19:17:50 UTC | Merge branch 'bg/xcalloc-nmemb-then-size' Like calloc(3), xcalloc() takes nmemb and then size. * bg/xcalloc-nmemb-then-size: transport-helper.c: rearrange xcalloc arguments remote.c: rearrange xcalloc arguments reflog-walk.c: rearrange xcalloc arguments pack-revindex.c: rearrange xcalloc arguments notes.c: rearrange xcalloc arguments imap-send.c: rearrange xcalloc arguments http-push.c: rearrange xcalloc arguments diff.c: rearrange xcalloc arguments config.c: rearrange xcalloc arguments commit.c: rearrange xcalloc arguments builtin/remote.c: rearrange xcalloc arguments builtin/ls-remote.c: rearrange xcalloc arguments | 16 June 2014, 19:17:50 UTC |
| 6d681f0 | Junio C Hamano | 16 June 2014, 17:07:19 UTC | Merge branch 'jl/status-added-submodule-is-never-ignored' submodule.*.ignore and diff.ignoresubmodules are used to ignore all submodule changes in "diff" output, but it can be confusing to apply these configuration values to status and commit. This is a backward-incompatible change, but should be so in a good way (aka bugfix). * jl/status-added-submodule-is-never-ignored: commit -m: commit staged submodules regardless of ignore config status/commit: show staged submodules regardless of ignore config | 16 June 2014, 17:07:19 UTC |
| 83a4904 | Junio C Hamano | 16 June 2014, 17:07:17 UTC | Merge branch 'cb/byte-order' Compatibility enhancement for Solaris. * cb/byte-order: compat/bswap.h: fix endianness detection compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER | 16 June 2014, 17:07:18 UTC |
| b4bba8d | Junio C Hamano | 16 June 2014, 17:07:16 UTC | Merge branch 'jk/strbuf-tolower' * jk/strbuf-tolower: strbuf: add strbuf_tolower function | 16 June 2014, 17:07:17 UTC |
| b4516df | Junio C Hamano | 16 June 2014, 17:07:14 UTC | Merge branch 'jk/daemon-tolower' * jk/daemon-tolower: daemon/config: factor out duplicate xstrdup_tolower | 16 June 2014, 17:07:15 UTC |
| 09e13ad | Junio C Hamano | 16 June 2014, 17:07:12 UTC | Merge branch 'as/pretty-truncate' * as/pretty-truncate: pretty.c: format string with truncate respects logOutputEncoding t4205, t6006: add tests that fail with i18n.logOutputEncoding set t4205 (log-pretty-format): use `tformat` rather than `format` t4041, t4205, t6006, t7102: don't hardcode tested encoding value t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs | 16 June 2014, 17:07:12 UTC |
| b0e2c99 | Junio C Hamano | 16 June 2014, 17:07:09 UTC | Merge branch 'jk/diff-follow-must-take-one-pathspec' * jk/diff-follow-must-take-one-pathspec: move "--follow needs one pathspec" rule to diff_setup_done | 16 June 2014, 17:07:09 UTC |
| b831636 | Junio C Hamano | 16 June 2014, 17:07:03 UTC | Merge branch 'sk/windows-unc-path' * sk/windows-unc-path: Windows: allow using UNC path for git repository | 16 June 2014, 17:07:03 UTC |
| 4a43d4f | Junio C Hamano | 16 June 2014, 17:06:57 UTC | Merge branch 'rr/rebase-autostash-fix' * rr/rebase-autostash-fix: rebase -i: test "Nothing to do" case with autostash rebase -i: handle "Nothing to do" case with autostash | 16 June 2014, 17:06:57 UTC |
| 9d1d882 | Junio C Hamano | 16 June 2014, 17:06:15 UTC | Merge branch 'jk/report-fail-to-read-objects-better' * jk/report-fail-to-read-objects-better: open_sha1_file: report "most interesting" errno | 16 June 2014, 17:06:15 UTC |
| 4144059 | Junio C Hamano | 16 June 2014, 17:06:12 UTC | Merge branch 'jk/diff-files-assume-unchanged' * jk/diff-files-assume-unchanged: run_diff_files: do not look at uninitialized stat data | 16 June 2014, 17:06:12 UTC |
| 5b3a58d | Junio C Hamano | 16 June 2014, 17:06:10 UTC | Merge branch 'jk/argv-array-for-child-process' * jk/argv-array-for-child-process: argv-array: drop "detach" code get_importer: use run-command's internal argv_array get_exporter: use argv_array get_helper: use run-command's internal argv_array git_connect: use argv_array run_column_filter: use argv_array run-command: store an optional argv_array | 16 June 2014, 17:06:10 UTC |
| 45dc292 | Junio C Hamano | 16 June 2014, 17:06:08 UTC | Merge branch 'sk/wincred' * sk/wincred: wincred: avoid overwriting configured variables wincred: add install target | 16 June 2014, 17:06:08 UTC |
| fd80021 | Junio C Hamano | 16 June 2014, 17:06:05 UTC | Merge branch 'jk/do-not-run-httpd-tests-as-root' * jk/do-not-run-httpd-tests-as-root: t/lib-httpd: require SANITY prereq | 16 June 2014, 17:06:05 UTC |
| 499168a | Junio C Hamano | 16 June 2014, 17:06:01 UTC | Merge branch 'cc/replace-edit' "git replace" learns a new "--edit" option. * cc/replace-edit: Documentation: replace: describe new --edit option replace: add --edit to usage string replace: add tests for --edit replace: die early if replace ref already exists replace: refactor checking ref validity replace: make sure --edit results in a different object replace: add --edit option replace: factor object resolution out of replace_object replace: use OPT_CMDMODE to handle modes replace: refactor command-mode determination | 16 June 2014, 17:06:01 UTC |
| 79e5394 | Junio C Hamano | 16 June 2014, 17:05:37 UTC | Merge branch 'mt/patch-id-stable' (early part) * 'mt/patch-id-stable' (early part): patch-id-test: test stable and unstable behaviour patch-id: make it stable against hunk reordering test doc: test_write_lines does not split its arguments test: add test_write_lines helper | 16 June 2014, 17:05:38 UTC |
| 75cc6c6 | Junio C Hamano | 12 June 2014, 19:22:38 UTC | Sync with maint * maint: pull: do not abuse 'break' inside a shell 'case' | 12 June 2014, 19:22:38 UTC |
| 9a597ed | Junio C Hamano | 12 June 2014, 19:17:57 UTC | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint * jc/rev-parse-argh-dashed-multi-words: update-index: fix segfault with missing --cacheinfo argument | 12 June 2014, 19:17:57 UTC |
| 8f92c77 | Jacek Konieczny | 11 June 2014, 08:47:45 UTC | pull: do not abuse 'break' inside a shell 'case' It is not C. The code would break under mksh when 'pull.ff' is set: $ git pull /usr/lib/git-core/git-pull[67]: break: can't break Already up-to-date. Signed-off-by: Jacek Konieczny <jajcus@jajcus.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2014, 19:15:49 UTC |
| c2369bd | Cezary Zawadka | 13 July 2010, 14:17:43 UTC | Windows: allow using UNC path for git repository [efl: moved MinGW-specific part to compat/] [jes: fixed compilation on non-Windows] Eric Sunshine fixed mingw_offset_1st_component() to return consistently "foo" for UNC "//machine/share/foo", cf http://groups.google.com/group/msysgit/browse_thread/thread/c0af578549b5dda0 Author: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Cezary Zawadka <czawadka@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Stepan Kasal <kasal@ucw.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2014, 20:30:04 UTC |
| 8f2514e | Michael S. Tsirkin | 27 April 2014, 18:15:51 UTC | patch-id-test: test stable and unstable behaviour Verify that patch ID supports an algorithm that is stable against diff split and reordering. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2014, 20:09:39 UTC |
| 30e12b9 | Michael S. Tsirkin | 27 April 2014, 18:15:44 UTC | patch-id: make it stable against hunk reordering Patch id changes if users reorder file diffs that make up a patch. As the result is functionally equivalent, a different patch id is surprising to many users. In particular, reordering files using diff -O is helpful to make patches more readable (e.g. API header diff before implementation diff). Add an option to change patch-id behaviour making it stable against these kinds of patch change: calculate SHA1 hash for each hunk separately and sum all hashes (using a symmetrical sum) to get patch id We use a 20byte sum and not xor - since xor would give 0 output for patches that have two identical diffs, which isn't all that unlikely (e.g. append the same line in two places). The new behaviour is enabled - when patchid.stable is true - when --stable flag is present Using a new flag --unstable or setting patchid.stable to false force the historical behaviour. In the documentation, clarify that patch ID can now be a sum of hashes, not a hash. Document how command line and config options affect the behaviour. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2014, 20:09:24 UTC |
| bb98b01 | Jonathan Nieder | 05 May 2014, 23:51:43 UTC | test doc: test_write_lines does not split its arguments test_write_lines carefully quotes its arguments as "$@", so test_write_lines "a b" c writes two lines as requested, not three. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2014, 20:09:05 UTC |
| ac9afcc | Michael S. Tsirkin | 27 April 2014, 18:15:47 UTC | test: add test_write_lines helper API and implementation as suggested by Junio. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2014, 20:09:00 UTC |
| 50f84e3 | Junio C Hamano | 09 June 2014, 18:39:43 UTC | Update draft release notes to 2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 June 2014, 18:39:43 UTC |
| 07768e0 | Junio C Hamano | 09 June 2014, 18:30:12 UTC | Merge branch 'jc/shortlog-ref-exclude' "log --exclude=<glob> --all | shortlog" worked as expected, but "shortlog --exclude=<glob> --all" was not accepted at the command line argument parser level. * jc/shortlog-ref-exclude: shortlog: allow --exclude=<glob> to be passed | 09 June 2014, 18:30:13 UTC |
| 251cb96 | Junio C Hamano | 09 June 2014, 18:27:55 UTC | Merge branch 'mn/sideband-no-ansi' Tools that read diagnostic output in our standard error stream do not want to see terminal control sequence (e.g. erase-to-eol). Detect them by checking if the standard error stream is connected to a tty. * mn/sideband-no-ansi: sideband.c: do not use ANSI control sequence on non-terminal | 09 June 2014, 18:27:56 UTC |
| d37e8c5 | Junio C Hamano | 09 June 2014, 18:27:53 UTC | Merge branch 'rs/mailinfo-header-cmp' Avoid running over the end of header string while parsing an incoming e-mail message to extract the patch. * rs/mailinfo-header-cmp: mailinfo: use strcmp() for string comparison | 09 June 2014, 18:27:53 UTC |
| 53b4d83 | Junio C Hamano | 09 June 2014, 18:27:47 UTC | Merge branch 'pb/trim-trailing-spaces' Fix an error in parsing of .gitignore files that use a trailing "\ " to mark pathnames that end with a SP. * pb/trim-trailing-spaces: dir.c:trim_trailing_spaces(): fix for " \ " sequence | 09 June 2014, 18:27:47 UTC |
| 0908b6d | Junio C Hamano | 09 June 2014, 18:26:51 UTC | Merge branch 'na/no-http-test-in-the-middle' The mode to run tests with HTTP server tests disabled was broken. * na/no-http-test-in-the-middle: t5538: move http push tests out to t5542 | 09 June 2014, 18:26:51 UTC |
| 0147602 | Junio C Hamano | 09 June 2014, 18:26:49 UTC | Merge branch 'jc/rev-parse-argh-dashed-multi-words' "update-index --cacheinfo" in 2.0 crashes on a malformed command line. * jc/rev-parse-argh-dashed-multi-words: update-index: fix segfault with missing --cacheinfo argument | 09 June 2014, 18:26:49 UTC |
| bfbdfa3 | Junio C Hamano | 09 June 2014, 18:26:22 UTC | Merge branch 'lt/request-pull' A brown-paper-bag bugfix to a test that turned out to be a no-op by mistake. * lt/request-pull: fix brown paper bag breakage in t5150-request-pull.sh | 09 June 2014, 18:26:23 UTC |
| acb3d22 | Tanay Abhra | 03 June 2014, 09:13:18 UTC | string-list: spell all values out that are given to a string_list initializer STRING_LIST_INIT_{NODUP,DUP} initializers list values only for earlier structure members, relying on the usual convention in C that the omitted members are initailized to 0, i.e. the former is expanded to the latter: struct string_list l = STRING_LIST_INIT_DUP; struct string_list l = { NULL, 0, 0, 1 }; and the last member that is not mentioned (i.e. 'cmp') is initialized to NULL. While there is nothing wrong in this construct, spelling out all the values where the macros are defined will serve also as a documentation, so let's do so. Signed-off-by: Tanay Abhra <tanayabh@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2014, 20:49:19 UTC |
| 7e28c16 | Ramsay Jones | 20 May 2014, 23:33:46 UTC | t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2014, 20:48:00 UTC |
| 0445e6f | Ilya Bobyr | 30 April 2014, 09:50:44 UTC | test-lib: '--run' to run only specific tests Allow better control of the set of tests that will be executed for a single test suite. Mostly useful while debugging or developing as it allows to focus on a specific test. Signed-off-by: Ilya Bobyr <ilya.bobyr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2014, 20:48:00 UTC |
| ef2ac68 | Ilya Bobyr | 30 April 2014, 09:50:43 UTC | test-lib: tests skipped by GIT_SKIP_TESTS say so We used to show "(missing )" next to tests skipped because they are specified in GIT_SKIP_TESTS. Use "(GIT_SKIP_TESTS)" instead. Plus tests that check basic GIT_SKIP_TESTS functions. Signed-off-by: Ilya Bobyr <ilya.bobyr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2014, 20:48:00 UTC |
| 5e3b4fc | Ilya Bobyr | 30 April 2014, 09:50:42 UTC | test-lib: document short options in t/README Most arguments that could be provided to a test have short forms. Unless documented, the only way to learn them is to read the code. Signed-off-by: Ilya Bobyr <ilya.bobyr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2014, 20:47:54 UTC |
| 0953113 | Junio C Hamano | 06 June 2014, 18:42:05 UTC | Second batch for 2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2014, 18:42:05 UTC |
| 75866e6 | Junio C Hamano | 06 June 2014, 18:39:12 UTC | Merge branch 'ss/howto-manage-trunk' * ss/howto-manage-trunk: How to keep a project's canonical history correct. | 06 June 2014, 18:39:12 UTC |
| eb5398a | Junio C Hamano | 06 June 2014, 18:38:57 UTC | Merge branch 'mc/git-p4-prepare-p4-only' * mc/git-p4-prepare-p4-only: git-p4: Do not include diff in spec file when just preparing p4 | 06 June 2014, 18:38:57 UTC |
| 3784ba3 | Junio C Hamano | 06 June 2014, 18:38:54 UTC | Merge branch 'jn/test-lint-unmoor' * jn/test-lint-unmoor: test-lint: find unportable sed, echo, test, and export usage after && | 06 June 2014, 18:38:54 UTC |
| 3ea8ecc | Junio C Hamano | 06 June 2014, 18:38:51 UTC | Merge branch 'ep/shell-assign-and-export-vars' * ep/shell-assign-and-export-vars: scripts: more "export VAR=VALUE" fixes scripts: "export VAR=VALUE" construct is not portable | 06 June 2014, 18:38:51 UTC |
| ed47bbd | Junio C Hamano | 06 June 2014, 18:38:48 UTC | Merge branch 'jj/command-line-adjective' * jj/command-line-adjective: Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues | 06 June 2014, 18:38:48 UTC |
| aa4bffa | Junio C Hamano | 06 June 2014, 18:38:44 UTC | Merge branch 'jc/coding-guidelines' * jc/coding-guidelines: CodingGuidelines: avoid "test <cond> -a/-o <cond>" CodingGuidelines: on splitting a long line CodingGuidelines: on comparison CodingGuidelines: do not call the conditional statement "if()" CodingGuidelines: give an example for shell function preamble CodingGuidelines: give an example for control statements CodingGuidelines: give an example for redirection CodingGuidelines: give an example for case/esac statement CodingGuidelines: once it is in, it is not worth the code churn | 06 June 2014, 18:38:45 UTC |
| 1e2600d | Junio C Hamano | 06 June 2014, 18:36:10 UTC | Merge branch 'nd/status-auto-comment-char' * nd/status-auto-comment-char: commit: allow core.commentChar=auto for character auto selection config: be strict on core.commentChar | 06 June 2014, 18:36:10 UTC |
| 0756529 | Junio C Hamano | 06 June 2014, 18:36:06 UTC | Merge branch 'mt/rebase-i-keep-empty-test' * mt/rebase-i-keep-empty-test: rebase --keep-empty -i: add test | 06 June 2014, 18:36:06 UTC |
| e7cc0ed | Junio C Hamano | 06 June 2014, 18:35:01 UTC | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' * mk/show-s-no-extra-blank-line-for-merges: git-show: fix 'git show -s' to not add extra terminator after merge commit | 06 June 2014, 18:35:02 UTC |
| 7e03f41 | Junio C Hamano | 06 June 2014, 18:32:49 UTC | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' * sk/spawn-less-case-insensitively-from-grep-O-i: git grep -O -i: if the pager is 'less', pass the '-I' option | 06 June 2014, 18:32:49 UTC |
| 7173ad7 | Junio C Hamano | 06 June 2014, 18:32:21 UTC | Merge branch 'jd/subtree' * jd/subtree: contrib/subtree: allow adding an annotated tag contrib/subtree/Makefile: clean up rule for "clean" contrib/subtree/Makefile: clean up rules to generate documentation contrib/subtree/Makefile: s/libexecdir/gitexecdir/ contrib/subtree/Makefile: use GIT-VERSION-FILE contrib/subtree/Makefile: scrap unused $(gitdir) | 06 June 2014, 18:32:21 UTC |
| c8704ad | Junio C Hamano | 06 June 2014, 18:32:13 UTC | Merge branch 'wk/doc-clarify-upstream' * wk/doc-clarify-upstream: Documentation: mention config sources for @{upstream} | 06 June 2014, 18:32:14 UTC |
| 334d40e | Junio C Hamano | 06 June 2014, 18:29:38 UTC | Merge branch 'tb/unicode-6.3-zero-width' Update the logic to compute the display width needed for utf8 strings and allow us to more easily maintain the tables used in that logic. We may want to let the users choose if codepoints with ambiguous widths are treated as a double or single width in a follow-up patch. * tb/unicode-6.3-zero-width: utf8: make it easier to auto-update git_wcwidth() utf8.c: use a table for double_width | 06 June 2014, 18:29:38 UTC |
| a046013 | Junio C Hamano | 06 June 2014, 18:28:13 UTC | Merge branch 'jk/index-pack-report-missing' * jk/index-pack-report-missing: index-pack: distinguish missing objects from type errors | 06 June 2014, 18:28:13 UTC |
| e934c67 | Junio C Hamano | 06 June 2014, 18:26:50 UTC | Merge branch 'bc/blame-crlf-test' If a file contained CRLF line endings in a repository with core.autocrlf=input, then blame always marked lines as "Not Committed Yet", even if they were unmodified. * bc/blame-crlf-test: blame: correctly handle files regardless of autocrlf | 06 June 2014, 18:26:50 UTC |
| ee82139 | Junio C Hamano | 06 June 2014, 18:26:38 UTC | Merge branch 'sk/submodules-absolute-path-on-windows' * sk/submodules-absolute-path-on-windows: Revert "submodules: fix ambiguous absolute paths under Windows" | 06 June 2014, 18:26:38 UTC |
| c7be99e | Junio C Hamano | 06 June 2014, 18:24:44 UTC | Merge branch 'dk/blame-reorg' "git blame" has been optimized greatly by reorganising the data structure that is used to keep track of the work to be done, thanks to David Karstrup <dak@gnu.org>. * dk/blame-reorg: blame: large-scale performance rewrite | 06 June 2014, 18:24:44 UTC |
| ff0b875 | Junio C Hamano | 06 June 2014, 18:24:32 UTC | Merge branch 'wg/svn-fe-style-fixes' * wg/svn-fe-style-fixes: svn-fe: conform to pep8 | 06 June 2014, 18:24:32 UTC |
| e318b83 | Junio C Hamano | 06 June 2014, 18:24:30 UTC | Merge branch 'jn/contrib-remove-vim' Spring cleaning of contrib/. * jn/contrib-remove-vim: contrib: remove vim support instructions | 06 June 2014, 18:24:30 UTC |
| c8eb5d3 | Junio C Hamano | 06 June 2014, 18:23:46 UTC | Merge branch 'jn/contrib-remove-diffall' Spring cleaning of contrib/. * jn/contrib-remove-diffall: contrib: remove git-diffall | 06 June 2014, 18:23:46 UTC |
| 067fe64 | Junio C Hamano | 06 June 2014, 18:23:13 UTC | Merge branch 'dt/merge-recursive-case-insensitive' On a case insensitive filesystem, merge-recursive incorrectly deleted the file that is to be renamed to a name that is the same except for case differences. * dt/merge-recursive-case-insensitive: mv: allow renaming to fix case on case insensitive filesystems merge-recursive.c: fix case-changing merge bug | 06 June 2014, 18:23:13 UTC |
| f7f349e | Junio C Hamano | 06 June 2014, 18:23:04 UTC | Merge branch 'rs/reflog-exists' * rs/reflog-exists: checkout.c: use ref_exists instead of file_exist refs.c: add new functions reflog_exists and delete_reflog | 06 June 2014, 18:23:04 UTC |
| 43eb7cb | Junio C Hamano | 06 June 2014, 18:22:24 UTC | Merge branch 'tg/tag-state-tag-name-in-editor-hints' * tg/tag-state-tag-name-in-editor-hints: builtin/tag.c: show tag name to hint in the message editor | 06 June 2014, 18:22:25 UTC |
| d83c9c7 | Junio C Hamano | 06 June 2014, 18:21:49 UTC | Merge branch 'jk/grep-tell-run-command-to-cd-when-running-pager' * jk/grep-tell-run-command-to-cd-when-running-pager: grep: use run-command's "dir" option for --open-files-in-pager | 06 June 2014, 18:21:49 UTC |
| 09e141f | Junio C Hamano | 06 June 2014, 18:21:47 UTC | Merge branch 'fc/status-printf-squelch-format-zero-length-warnings' * fc/status-printf-squelch-format-zero-length-warnings: silence a bunch of format-zero-length warnings | 06 June 2014, 18:21:47 UTC |
| 610a14f | Junio C Hamano | 06 June 2014, 18:21:36 UTC | Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro' * jk/squelch-compiler-warning-from-funny-error-macro: let clang use the constant-return error() macro inline constant return from error() function | 06 June 2014, 18:21:36 UTC |
| d2a274a | Junio C Hamano | 06 June 2014, 18:18:34 UTC | Merge branch 'dk/raise-core-deltabasecachelimit' The `core.deltabasecachelimit` used to default to 16 MiB , but this proved to be too small, and has been bumped to 96 MiB. * dk/raise-core-deltabasecachelimit: Bump core.deltaBaseCacheLimit to 96m | 06 June 2014, 18:18:34 UTC |
| 7461a3e | Junio C Hamano | 06 June 2014, 18:18:29 UTC | Merge branch 'tl/relax-in-poll-emulation' * tl/relax-in-poll-emulation: compat/poll: sleep 1 millisecond to avoid busy wait | 06 June 2014, 18:18:29 UTC |
| 1265886 | Junio C Hamano | 06 June 2014, 18:18:26 UTC | Merge branch 'jk/utf8-switch-between-nfd-and-nfc' Document a known breakage with a test. * jk/utf8-switch-between-nfd-and-nfc: t3910: show failure of core.precomposeunicode with decomposed filenames | 06 June 2014, 18:18:26 UTC |
| 89080fc | Junio C Hamano | 06 June 2014, 18:17:56 UTC | Merge branch 'da/imap-send-use-credential-helper' "git imap-send" learns to ask the credential helper for authentication material. * da/imap-send-use-credential-helper: imap-send: use git-credential | 06 June 2014, 18:17:56 UTC |
| db6fbe3 | Junio C Hamano | 06 June 2014, 18:16:59 UTC | Merge branch 'je/pager-do-not-recurse' We used to unconditionally disable the pager in the pager process we spawn to feed out output, but that prevented people who want to run "less" within "less" from doing so. * je/pager-do-not-recurse: pager: do allow spawning pager recursively | 06 June 2014, 18:17:00 UTC |
| e88155d | Junio C Hamano | 06 June 2014, 18:16:04 UTC | Merge branch 'jk/commit-C-pick-empty' "git commit --allow-empty-message -C $commit" did not work when the commit did not have any log message. * jk/commit-C-pick-empty: commit: do not complain of empty messages from -C | 06 June 2014, 18:16:04 UTC |
| 561d952 | Junio C Hamano | 06 June 2014, 18:02:59 UTC | Merge branch 'mm/pager-less-sans-S' Since the very beginning of Git, we gave the LESS environment a default value "FRSX" when we spawn "less" as the pager. "S" (chop long lines instead of wrapping) has been removed from this default set of options, because it is more or less a personal taste thing, as opposed to others that have good justifications (i.e. "R" is very much justified because many kinds of output we produce are colored and "FX" is justified because output we produce is often shorter than a page). Existing users who prefer not to see line-wrapped output may want to set $ git config core.pager "less -S" to restore the traditional behaviour. It is expected that people find output from the most subcommands easier to read with the new default, except for "blame" which tends to produce really long lines. To override the new default only for "git blame", you can do this: $ git config pager.blame "less -S" * mm/pager-less-sans-S: pager: remove 'S' from $LESS by default | 06 June 2014, 18:02:59 UTC |
| dde8a90 | David Turner | 04 June 2014, 03:38:10 UTC | refs.c: optimize check_refname_component() In a repository with many refs, check_refname_component can be a major contributor to the runtime of some git commands. One such command is git rev-parse HEAD Timings for one particular repo, with about 60k refs, almost all packed, are: Old: 35 ms New: 29 ms Many other commands which read refs are also sped up. Signed-off-by: David Turner <dturner@twitter.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 June 2014, 22:24:50 UTC |
| dce6818 | Jeremiah Mahler | 05 June 2014, 05:18:18 UTC | t/t7810-grep.sh: remove duplicate test_config() t/t7810-grep.sh had its own test_config() function which served the same purpose as the one in t/test-lib-functions.sh. Removed, all tests pass. Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 June 2014, 18:56:01 UTC |
| eb07774 | Junio C Hamano | 30 May 2014, 19:57:25 UTC | shortlog: allow --exclude=<glob> to be passed These two commands are supposed to be equivalent: $ git log --exclude=refs/notes/\* --all --no-merges --since=2.days | git shortlog $ git shortlog --exclude=refs/notes/\* --all --no-merges --since=2.days However, the latter does not understand the ref-exclusion command line option, even though other options understood by "log", such as "--all" and "--no-merges", are understood. This was because e7b432c5 (revision: introduce --exclude=<glob> to tame wildcards, 2013-08-30) did not wire the new option fully to the machinery. A new option understood by handle_revision_pseudo_opt() must be told to handle_revision_opt() as well. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2014, 20:41:33 UTC |
| b93e6e3 | Stepan Kasal | 04 June 2014, 15:57:52 UTC | t5000, t5003: do not use test_cmp to compare binary files test_cmp() is primarily meant to compare text files (and display the difference for debug purposes). Raw "cmp" is better suited to compare binary files (tar, zip, etc.). On MinGW, test_cmp is a shell function mingw_test_cmp that tries to read both files into environment, stripping CR characters (introduced in commit 4d715ac0). This function usually speeds things up, as fork is extremly slow on Windows. But no wonder that this function is extremely slow and sometimes even crashes when comparing large tar or zip files. Signed-off-by: Stepan Kasal <kasal@ucw.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2014, 18:14:25 UTC |
| c8e1ee4 | Jeff King | 04 June 2014, 07:11:11 UTC | update-index: fix segfault with missing --cacheinfo argument Running "git update-index --cacheinfo" without any further arguments results in a segfault rather than an error message. Commit ec160ae (update-index: teach --cacheinfo a new syntax "mode,sha1,path", 2014-03-23) added code to examine the format of the argument, but forgot to handle the NULL case. Returning an error from the parser is enough, since we then treat it as an old-style "--cacheinfo <mode> <sha1> <path>", and complain that we have less than 3 arguments to read. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2014, 18:02:55 UTC |
| 79dcccc | Junio C Hamano | 03 June 2014, 19:08:37 UTC | First batch for 2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2014, 19:09:13 UTC |
| 14ce98d | Junio C Hamano | 03 June 2014, 19:06:46 UTC | Merge branch 'sk/msvc-dynlink-crt' * sk/msvc-dynlink-crt: MSVC: link dynamically to the CRT | 03 June 2014, 19:06:46 UTC |
