| 16ffa64 | Junio C Hamano | 02 September 2015, 19:55:21 UTC | Git 2.6-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 September 2015, 19:55:28 UTC |
| cdd00df | Junio C Hamano | 02 September 2015, 19:50:21 UTC | Merge branch 'cc/trailers-corner-case-fix' The "interpret-trailers" helper mistook a multi-paragraph title of a commit log message with a colon in it as the end of the trailer block. * cc/trailers-corner-case-fix: trailer: support multiline title | 02 September 2015, 19:50:21 UTC |
| 8f8386e | Junio C Hamano | 02 September 2015, 19:50:18 UTC | Merge branch 'sb/read-cache-one-indent-style-fix' * sb/read-cache-one-indent-style-fix: read-cache: fix indentation in read_index_from | 02 September 2015, 19:50:18 UTC |
| 83d9092 | Junio C Hamano | 02 September 2015, 19:50:16 UTC | Merge branch 'ee/clean-test-fixes' * ee/clean-test-fixes: t7300: fix broken && chains | 02 September 2015, 19:50:16 UTC |
| 699a0f3 | Junio C Hamano | 02 September 2015, 19:50:08 UTC | Merge branch 'jk/log-missing-default-HEAD' "git init empty && git -C empty log" said "bad default revision 'HEAD'", which was found to be a bit confusing to new users. * jk/log-missing-default-HEAD: log: diagnose empty HEAD more clearly | 02 September 2015, 19:50:10 UTC |
| 7aa67f6 | Junio C Hamano | 01 September 2015, 23:31:58 UTC | Ninth batch for 2.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 September 2015, 23:31:58 UTC |
| 81d0e33 | Junio C Hamano | 01 September 2015, 23:31:29 UTC | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update' When re-priming the cache-tree opportunistically while committing the in-core index as-is, we mistakenly invalidated the in-core index too aggressively, causing the experimental split-index code to unnecessarily rewrite the on-disk index file(s). * dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update: commit: don't rewrite shared index unnecessarily | 01 September 2015, 23:31:29 UTC |
| 0fb8e24 | Junio C Hamano | 01 September 2015, 23:31:26 UTC | Merge branch 'rt/remove-hold-lockfile-for-append' * rt/remove-hold-lockfile-for-append: lockfile: remove function "hold_lock_file_for_append" | 01 September 2015, 23:31:27 UTC |
| 565f575 | Junio C Hamano | 01 September 2015, 23:31:24 UTC | Merge branch 'rs/archive-zip-many' "git archive" did not use zip64 extension when creating an archive with more than 64k entries, which nobody should need, right ;-)? * rs/archive-zip-many: archive-zip: support more than 65535 entries archive-zip: use a local variable to store the creator version t5004: test ZIP archives with many entries | 01 September 2015, 23:31:24 UTC |
| bb84dce | Junio C Hamano | 01 September 2015, 23:31:22 UTC | Merge branch 'ls/p4-fold-case-client-specs' On case insensitive systems, "git p4" did not work well with client specs. * ls/p4-fold-case-client-specs: git-p4: honor core.ignorecase when using P4 client specs | 01 September 2015, 23:31:22 UTC |
| 2953140 | Junio C Hamano | 01 September 2015, 23:31:21 UTC | Merge branch 'ah/submodule-typofix-in-error' Error string fix. * ah/submodule-typofix-in-error: git-submodule: remove extraneous space from error message | 01 September 2015, 23:31:21 UTC |
| bc1c600 | Junio C Hamano | 01 September 2015, 23:31:18 UTC | Merge branch 'ah/reflog-typofix-in-error' Error string fix. * ah/reflog-typofix-in-error: reflog: add missing single quote to error message | 01 September 2015, 23:31:18 UTC |
| 0b20a46 | Junio C Hamano | 01 September 2015, 23:31:15 UTC | Merge branch 'ah/read-tree-usage-string' Usage string fix. * ah/read-tree-usage-string: read-tree: replace bracket set with parentheses to clarify usage | 01 September 2015, 23:31:16 UTC |
| 8746e30 | Junio C Hamano | 01 September 2015, 23:31:12 UTC | Merge branch 'ah/pack-objects-usage-strings' Usage string fix. * ah/pack-objects-usage-strings: pack-objects: place angle brackets around placeholders in usage strings | 01 September 2015, 23:31:12 UTC |
| 49c15c0 | Junio C Hamano | 01 September 2015, 23:31:09 UTC | Merge branch 'br/svn-doc-include-paths-config' * br/svn-doc-include-paths-config: git-svn doc: mention "svn-remote.<name>.include-paths" | 01 September 2015, 23:31:10 UTC |
| 91d5469 | Junio C Hamano | 01 September 2015, 23:31:06 UTC | Merge branch 'nd/fixup-linked-gitdir' The code in "multiple-worktree" support that attempted to recover from an inconsistent state updated an incorrect file. * nd/fixup-linked-gitdir: setup: update the right file in multiple checkouts | 01 September 2015, 23:31:07 UTC |
| 1616360 | Junio C Hamano | 31 August 2015, 22:40:24 UTC | Eighth batch for 2.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2015, 22:40:24 UTC |
| e95c3fb | Junio C Hamano | 31 August 2015, 22:39:10 UTC | Merge branch 'sg/describe-contains' "git describe" without argument defaulted to describe the HEAD commit, but "git describe --contains" didn't. Arguably, in a repository used for active development, such defaulting would not be very useful as the tip of branch is typically not tagged, but it is better to be consistent. * sg/describe-contains: describe --contains: default to HEAD when no commit-ish is given | 31 August 2015, 22:39:10 UTC |
| b21089d | Junio C Hamano | 31 August 2015, 22:39:07 UTC | Merge branch 'db/push-sign-if-asked' The client side codepaths in "git push" have been cleaned up and the user can request to perform an optional "signed push", i.e. sign only when the other end accepts signed push. * db/push-sign-if-asked: push: add a config option push.gpgSign for default signed pushes push: support signing pushes iff the server supports it builtin/send-pack.c: use parse_options API config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_bool transport: remove git_transport_options.push_cert gitremote-helpers.txt: document pushcert option Documentation/git-send-pack.txt: document --signed Documentation/git-send-pack.txt: wrap long synopsis line Documentation/git-push.txt: document when --signed may fail | 31 August 2015, 22:39:08 UTC |
| 5b6211a | Junio C Hamano | 31 August 2015, 22:39:05 UTC | Merge branch 'jk/notes-merge-config' "git notes merge" can be told with "--strategy=<how>" option how to automatically handle conflicts; this can now be configured by setting notes.mergeStrategy configuration variable. * jk/notes-merge-config: notes: teach git-notes about notes.<name>.mergeStrategy option notes: add notes.mergeStrategy option to select default strategy notes: add tests for --commit/--abort/--strategy exclusivity notes: extract parse_notes_merge_strategy to notes-utils notes: extract enum notes_merge_strategy to notes-utils.h notes: document cat_sort_uniq rewriteMode | 31 August 2015, 22:39:05 UTC |
| d75bb73 | Junio C Hamano | 31 August 2015, 22:39:01 UTC | Merge branch 'jc/am-state-fix' Recent reimplementation of "git am" changed the format of state files kept in $GIT_DIR/rebase-apply/ without meaning to do so, primarily because write_file() API was cumbersome to use and it was easy to mistakenly make text files with incomplete lines. Update write_file() interface to make it harder to misuse. * jc/am-state-fix: write_file(): drop caller-supplied LF from calls to create a one-liner file write_file_v(): do not leave incomplete line at the end write_file(): drop "fatal" parameter builtin/am: make sure state files are text builtin/am: introduce write_state_*() helper functions | 31 August 2015, 22:39:03 UTC |
| 2ba6183 | Junio C Hamano | 31 August 2015, 22:38:59 UTC | Merge branch 'jc/log-p-cc' "git log --cc" did not show any patch, even though most of the time the user meant "git log --cc -p -m" to see patch output for commits with a single parent, and combined diff for merge commits. The command is taught to DWIM "--cc" (without "--raw" and other forms of output specification) to "--cc -p -m". * jc/log-p-cc: builtin/log.c: minor reformat log: show merge commit when --cc is given log: when --cc is given, default to -p unless told otherwise log: rename "tweak" helpers | 31 August 2015, 22:38:59 UTC |
| 7b7c10b | Junio C Hamano | 31 August 2015, 22:38:57 UTC | Merge branch 'jk/fix-alias-pager-config-key-warnings' Because the configuration system does not allow "alias.0foo" and "pager.0foo" as the configuration key, the user cannot use '0foo' as a custom command name anyway, but "git 0foo" tried to look these keys up and emitted useless warnings before saying '0foo is not a git command'. These warning messages have been squelched. * jk/fix-alias-pager-config-key-warnings: config: silence warnings for command names with invalid keys | 31 August 2015, 22:38:57 UTC |
| 0bb71fb | Junio C Hamano | 31 August 2015, 22:38:54 UTC | Merge branch 'jk/rev-list-has-no-notes' "git rev-list" does not take "--notes" option, but did not complain when one is given. * jk/rev-list-has-no-notes: rev-list: make it obvious that we do not support notes | 31 August 2015, 22:38:55 UTC |
| 5a4f07b | Junio C Hamano | 31 August 2015, 22:38:52 UTC | Merge branch 'hv/submodule-config' The gitmodules API accessed from the C code learned to cache stuff lazily. * hv/submodule-config: submodule: allow erroneous values for the fetchRecurseSubmodules option submodule: use new config API for worktree configurations submodule: extract functions for config set and lookup submodule: implement a config API for lookup of .gitmodules values | 31 August 2015, 22:38:52 UTC |
| fc9dfda | Junio C Hamano | 31 August 2015, 22:38:50 UTC | Merge branch 'sg/config-name-only' "git config --list" output was hard to parse when values consist of multiple lines. "--name-only" option is added to help this. * sg/config-name-only: get_urlmatch: avoid useless strbuf write format_config: simplify buffer handling format_config: don't init strbuf config: restructure format_config() for better control flow completion: list variable names reliably with 'git config --name-only' config: add '--name-only' option to list only variable names | 31 August 2015, 22:38:50 UTC |
| 6bea53c | Stefan Beller | 31 August 2015, 18:43:29 UTC | read-cache: fix indentation in read_index_from Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2015, 19:31:00 UTC |
| 5c99995 | Christian Couder | 30 August 2015, 19:14:40 UTC | trailer: support multiline title We currently ignore the first line passed to `git interpret-trailers`, when looking for the beginning of the trailers. Unfortunately this does not work well when a commit is created with a line break in the title, using for example the following command: git commit -m 'place of code: change we made' That's why instead of ignoring only the first line, it is better to ignore the first paragraph. Signed-off-by: Christian Couder <christian.couder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2015, 18:14:08 UTC |
| 1733ed3 | Erik Elfström | 30 August 2015, 09:18:09 UTC | t7300: fix broken && chains While we are here, remove some boilerplate by using test_commit. Signed-off-by: Erik Elfström <erik.elfstrom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2015, 16:46:36 UTC |
| ce11360 | Jeff King | 29 August 2015, 05:04:18 UTC | log: diagnose empty HEAD more clearly If you init or clone an empty repository, the initial message from running "git log" is not very friendly: $ git init Initialized empty Git repository in /home/peff/foo/.git/ $ git log fatal: bad default revision 'HEAD' Let's detect this situation and write a more friendly message: $ git log fatal: your current branch 'master' does not have any commits yet We also detect the case that 'HEAD' points to a broken ref; this should be even less common, but is easy to see. Note that we do not diagnose all possible cases. We rely on resolve_ref, which means we do not get information about complex cases. E.g., "--default master" would use dwim_ref to find "refs/heads/master", but we notice only that "master" does not exist. Similarly, a complex sha1 expression like "--default HEAD^2" will not resolve as a ref. But that's OK. We fall back to a generic error message in those cases, and they are unlikely to be used anyway. Catching an empty or broken "HEAD" improves the common case, and the other cases are not regressed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2015, 16:34:20 UTC |
| 475a344 | David Turner | 27 August 2015, 17:07:54 UTC | commit: don't rewrite shared index unnecessarily Remove a cache invalidation which would cause the shared index to be rewritten on as-is commits. When the cache-tree has changed, we need to update it. But we don't necessarily need to update the shared index. So setting active_cache_changed to SOMETHING_CHANGED is unnecessary. Instead, we let update_main_cache_tree just update the CACHE_TREE_CHANGED bit. In order to test this, make test-dump-split-index not segfault on missing replace_bitmap/delete_bitmap. This new codepath is not called now that the test passes, but is necessary to avoid a segfault when the new test is run with the old builtin/commit.c code. Signed-off-by: David Turner <dturner@twopensource.com> Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2015, 15:41:07 UTC |
| aecce6d | Junio C Hamano | 28 August 2015, 19:32:45 UTC | Sync with 2.5.1 | 28 August 2015, 19:32:45 UTC |
| e6837c8 | Junio C Hamano | 28 August 2015, 19:27:39 UTC | Seventh batch for 2.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 19:32:25 UTC |
| 483c9b8 | Junio C Hamano | 28 August 2015, 19:32:17 UTC | Merge branch 'cc/trailers-corner-case-fix' "interpret-trailers" helper mistook a single-liner log message that has a colon as the end of existing trailer. * cc/trailers-corner-case-fix: trailer: retitle a test and correct an in-comment message trailer: ignore first line of message | 28 August 2015, 19:32:17 UTC |
| 038226e | Junio C Hamano | 28 August 2015, 19:32:14 UTC | Merge branch 'dt/untracked-subdir' The experimental untracked-cache feature were buggy when paths with a few levels of subdirectories are involved. * dt/untracked-subdir: untracked cache: fix entry invalidation untracked-cache: fix subdirectory handling | 28 August 2015, 19:32:15 UTC |
| 9476c2c | Alex Henrie | 27 August 2015, 04:27:06 UTC | read-tree: replace bracket set with parentheses to clarify usage -u and -i can only be given if -m, --reset, or --prefix is given. Without parentheses, it looks like -u and -i can be used no matter what, and the second pair of brackets is confusing. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 19:01:37 UTC |
| b8c1d27 | Alex Henrie | 27 August 2015, 04:26:36 UTC | pack-objects: place angle brackets around placeholders in usage strings Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 18:59:10 UTC |
| b80fa84 | Alex Henrie | 27 August 2015, 04:26:19 UTC | git-submodule: remove extraneous space from error message Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Acked-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 18:57:24 UTC |
| aae42e4 | Ralf Thielow | 28 August 2015, 16:55:52 UTC | lockfile: remove function "hold_lock_file_for_append" With 77b9b1d (add_to_alternates_file: don't add duplicate entries, 2015-08-10) the last caller of function "hold_lock_file_for_append" has been removed, so we can remove the function as well. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 18:32:01 UTC |
| c415fb7 | Junio C Hamano | 28 August 2015, 18:19:57 UTC | Git 2.5.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 18:19:57 UTC |
| c3cb7b6 | Jose F. Morales | 28 August 2015, 09:43:37 UTC | Mingw: verify both ends of the pipe () call The code to open and test the second end of the pipe clearly imitates the code for the first end. A little too closely, though... Let's fix the obvious copy-edit bug. Signed-off-by: Jose F. Morales <jfmcjf@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 18:11:50 UTC |
| a0a50d8 | Lars Schneider | 28 August 2015, 12:00:34 UTC | git-p4: honor core.ignorecase when using P4 client specs Perforce depot may record paths in mixed cases, e.g. "p4 files" may show that there are these two paths: //depot/Path/to/file1 //depot/pATH/to/file2 and with "p4" or "p4v", these end up in the same directory, e.g. //depot/Path/to/file1 //depot/Path/to/file2 which is the desired outcome on case insensitive systems. If git-p4 is used with client spec "//depot/Path/...", however, then all files not matching the case in the client spec are ignored (in the example above "//depot/pATH/to/file2"). Fix this by using the path case that appears first in lexicographical order when core.ignorecase is set to true. This behavior is consistent with "p4" and "p4v". Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 17:33:16 UTC |
| 99885bc | Alex Henrie | 27 August 2015, 04:26:02 UTC | reflog: add missing single quote to error message The error message can be seen by running `git config gc.reflogexpire foo` and then `git reflog expire`. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 16:42:13 UTC |
| 88329ca | René Scharfe | 22 August 2015, 19:06:45 UTC | archive-zip: support more than 65535 entries Support more than 65535 entries cleanly by writing a "zip64 end of central directory record" (with a 64-bit field for the number of entries) before the usual "end of central directory record" (which contains only a 16-bit field). InfoZIP's zip does the same. Archives with 65535 or less entries are not affected. Programs that extract all files like InfoZIP's zip and 7-Zip ignored the field and could extract all files already. Software that relies on the ZIP file directory to show a list of contained files quickly to simulate to normal directory like Windows' built-in ZIP functionality only saw a subset of the included files. Windows supports ZIP64 since Vista according to https://en.wikipedia.org/wiki/Zip_%28file_format%29#ZIP64. Suggested-by: Johannes Schauer <josch@debian.org> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 15:54:57 UTC |
| 0f747f9 | René Scharfe | 22 August 2015, 19:06:31 UTC | archive-zip: use a local variable to store the creator version Use a simpler conditional right next to the code which makes a higher creator version necessary -- namely symlink handling and support for executable files -- instead of a long line with a ternary operator. The resulting code has more lines but is simpler and allows reuse of the value easily. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 15:52:22 UTC |
| 19ee294 | René Scharfe | 22 August 2015, 19:06:12 UTC | t5004: test ZIP archives with many entries A ZIP file directory has a 16-bit field for the number of entries it contains. There are 64-bit extensions to deal with that. Demonstrate that git archive --format=zip currently doesn't use them and instead overflows the field. InfoZIP's unzip doesn't care about this field and extracts all files anyway. Software that uses the directory for presenting a filesystem like view quickly -- notably Windows -- depends on it, but doesn't lend itself to an automatic test case easily. Use InfoZIP's zipinfo, which probably isn't available everywhere but at least can provides *some* way to check this field. To speed things up a bit create and commit only a subset of the files and build a fake tree out of duplicates and pass that to git archive. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 August 2015, 15:52:10 UTC |
| 3a9835b | Junio C Hamano | 26 August 2015, 22:47:48 UTC | Sixth batch for 2.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 August 2015, 22:47:48 UTC |
| 678c5a4 | Junio C Hamano | 26 August 2015, 22:45:39 UTC | Merge branch 'sg/help-group' We rewrote one of the build scripts in Perl but this reimplements in Bourne shell. * sg/help-group: generate-cmdlist: re-implement as shell script | 26 August 2015, 22:45:40 UTC |
| 6525496 | Junio C Hamano | 26 August 2015, 22:45:38 UTC | Merge branch 'sg/wt-status-header-inclusion' * sg/wt-status-header-inclusion: wt-status: move #include "pathspec.h" to the header | 26 August 2015, 22:45:38 UTC |
| cfcd38f | Junio C Hamano | 26 August 2015, 22:45:37 UTC | Merge branch 'as/docfix-reflog-expire-unreachable' * as/docfix-reflog-expire-unreachable: Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachable | 26 August 2015, 22:45:37 UTC |
| 7205e22 | Junio C Hamano | 26 August 2015, 22:45:35 UTC | Merge branch 'sg/t3020-typofix' * sg/t3020-typofix: t3020: fix typo in test description | 26 August 2015, 22:45:36 UTC |
| 88bd19b | Junio C Hamano | 26 August 2015, 22:45:33 UTC | Merge branch 'jc/calloc-pathspec' * jc/calloc-pathspec: ps_matched: xcalloc() takes nmemb and then element size | 26 August 2015, 22:45:34 UTC |
| a5315dd | Junio C Hamano | 26 August 2015, 22:45:33 UTC | Merge branch 'dt/untracked-sparse' Test update. * dt/untracked-sparse: t7063: use --force-untracked-cache to speed up a bit | 26 August 2015, 22:45:33 UTC |
| 74702c3 | Junio C Hamano | 26 August 2015, 22:45:33 UTC | Merge branch 'pt/am-builtin' Rewrite "am" in "C". * pt/am-builtin: i18n: am: fix typo in description of -b option | 26 August 2015, 22:45:33 UTC |
| b7d2a15 | Junio C Hamano | 26 August 2015, 22:45:32 UTC | Merge branch 'pt/am-builtin-abort-fix' "git am" that was recently reimplemented in C had a performance regression in "git am --abort" that goes back to the version before an attempted (and failed) patch application. * pt/am-builtin-abort-fix: am --skip/--abort: merge HEAD/ORIG_HEAD tree into index | 26 August 2015, 22:45:32 UTC |
| 788f211 | Junio C Hamano | 26 August 2015, 22:45:32 UTC | Merge branch 'po/po-readme' * po/po-readme: po/README: Update directions for l10n contributors | 26 August 2015, 22:45:32 UTC |
| 629ac65 | Junio C Hamano | 26 August 2015, 22:45:31 UTC | Merge branch 'jv/send-email-selective-smtp-auth' "git send-email" learned a new option --smtp-auth to limit the SMTP AUTH mechanisms to be used to a subset of what the system library supports. * jv/send-email-selective-smtp-auth: send-email: provide whitelist of SMTP AUTH mechanisms | 26 August 2015, 22:45:31 UTC |
| ed070a4 | Junio C Hamano | 26 August 2015, 22:45:31 UTC | Merge branch 'ep/http-configure-ssl-version' A new configuration variable http.sslVersion can be used to specify what specific version of SSL/TLS to use to make a connection. * ep/http-configure-ssl-version: http: add support for specifying the SSL version | 26 August 2015, 22:45:31 UTC |
| 51e83a4 | Junio C Hamano | 26 August 2015, 22:45:30 UTC | Merge branch 'ss/fix-config-fd-leak' * ss/fix-config-fd-leak: config: close config file handle in case of error | 26 August 2015, 22:45:30 UTC |
| 1fb5a0e | Jiang Xin | 26 August 2015, 15:51:19 UTC | i18n: am: fix typo in description of -b option Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 August 2015, 19:51:43 UTC |
| 6262fe9 | Christian Couder | 26 August 2015, 02:51:00 UTC | trailer: retitle a test and correct an in-comment message Signed-off-by: Christian Couder <christian.couder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 August 2015, 19:16:56 UTC |
| 486e1e1 | Brett Randall | 24 August 2015, 00:23:45 UTC | git-svn doc: mention "svn-remote.<name>.include-paths" Mention the configuration variable in a way similar to how "svn-remote.<name>.ignore-paths" is mentioned. Signed-off-by: Brett Randall <javabrett@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 August 2015, 17:27:26 UTC |
| 33f2c4f | Junio C Hamano | 25 August 2015, 23:09:30 UTC | Sync with maint * maint: pull: pass upload_pack only when it was given | 25 August 2015, 23:09:30 UTC |
| 52f6893 | Junio C Hamano | 25 August 2015, 23:09:17 UTC | Merge branch 'jk/guess-repo-name-regression-fix' into maint "git clone $URL" in recent releases of Git contains a regression in the code that invents a new repository name incorrectly based on the $URL. This has been corrected. * jk/guess-repo-name-regression-fix: clone: use computed length in guess_dir_name clone: add tests for output directory | 25 August 2015, 23:09:17 UTC |
| 84deb3e | Junio C Hamano | 25 August 2015, 23:09:16 UTC | Merge branch 'jk/test-with-x' into maint Running tests with the "-x" option to make them verbose had some unpleasant interactions with other features of the test suite. * jk/test-with-x: test-lib: disable trace when test is not verbose test-lib: turn off "-x" tracing during chain-lint check | 25 August 2015, 23:09:16 UTC |
| 7a23807 | Junio C Hamano | 25 August 2015, 23:09:16 UTC | Merge branch 'sb/check-return-from-read-ref' into maint * sb/check-return-from-read-ref: transport-helper: die on errors reading refs. | 25 August 2015, 23:09:16 UTC |
| 425a4c7 | Junio C Hamano | 25 August 2015, 23:09:15 UTC | Merge branch 'mm/pull-upload-pack' into maint "git pull" in recent releases of Git has a regression in the code that allows custom path to the --upload-pack=<program>. This has been corrected. Note that this is irrelevant for 'master' with "git pull" rewritten in C. * mm/pull-upload-pack: pull: pass upload_pack only when it was given pull.sh: quote $upload_pack when passing it to git-fetch | 25 August 2015, 23:09:15 UTC |
| 13e0e28 | Junio C Hamano | 25 August 2015, 23:06:53 UTC | pull: pass upload_pack only when it was given The upload_pack shell variable is initialized to an empty string, so conditional expansion with ${upload_pack+"$upload_pack"} would not work very well. You need a colon there. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 August 2015, 23:08:58 UTC |
| 8da8889 | Junio C Hamano | 25 August 2015, 22:00:15 UTC | Fifth batch for 2.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 August 2015, 22:00:25 UTC |
| 9b8d731 | Junio C Hamano | 25 August 2015, 21:57:10 UTC | Merge branch 'cb/open-noatime-clear-errno' When trying to see that an object does not exist, a state errno leaked from our "first try to open a packfile with O_NOATIME and then if it fails retry without it" logic on a system that refuses O_NOATIME. This confused us and caused us to die, saying that the packfile is unreadable, when we should have just reported that the object does not exist in that packfile to the caller. * cb/open-noatime-clear-errno: git_open_noatime: return with errno=0 on success | 25 August 2015, 21:57:10 UTC |
| db86e61 | Junio C Hamano | 25 August 2015, 21:57:09 UTC | Merge branch 'mh/tempfile' The "lockfile" API has been rebuilt on top of a new "tempfile" API. * mh/tempfile: credential-cache--daemon: use tempfile module credential-cache--daemon: delete socket from main() gc: use tempfile module to handle gc.pid file lock_repo_for_gc(): compute the path to "gc.pid" only once diff: use tempfile module setup_temporary_shallow(): use tempfile module write_shared_index(): use tempfile module register_tempfile(): new function to handle an existing temporary file tempfile: add several functions for creating temporary files prepare_tempfile_object(): new function, extracted from create_tempfile() tempfile: a new module for handling temporary files commit_lock_file(): use get_locked_file_path() lockfile: add accessor get_lock_file_path() lockfile: add accessors get_lock_file_fd() and get_lock_file_fp() create_bundle(): duplicate file descriptor to avoid closing it twice lockfile: move documentation to lockfile.h and lockfile.c | 25 August 2015, 21:57:09 UTC |
| 424f89f | Junio C Hamano | 25 August 2015, 21:57:08 UTC | Merge branch 'pt/am-builtin-options' After "git am --opt1" stops, running "git am --opt2" pays attention to "--opt2" only for the patch that caused the original invocation to stop. * pt/am-builtin-options: am: let --signoff override --no-signoff am: let command-line options override saved options test_terminal: redirect child process' stdin to a pty | 25 August 2015, 21:57:08 UTC |
| 080cc64 | Junio C Hamano | 25 August 2015, 21:57:08 UTC | Merge branch 'dt/refs-pseudo' To prepare for allowing a different "ref" backend to be plugged in to the system, update_ref()/delete_ref() have been taught about ref-like things like MERGE_HEAD that are per-worktree (they will always be written to the filesystem inside $GIT_DIR). * dt/refs-pseudo: pseudoref: check return values from read_ref() sequencer: replace write_cherry_pick_head with update_ref bisect: use update_ref pseudorefs: create and use pseudoref update and delete functions refs: add ref_type function refs: introduce pseudoref and per-worktree ref concepts | 25 August 2015, 21:57:08 UTC |
| 32561f5 | Junio C Hamano | 25 August 2015, 21:57:08 UTC | Merge branch 'dt/notes-multiple' When linked worktree is used, simultaneous "notes merge" instances for the same ref in refs/notes/* are prevented from stomping on each other. * dt/notes-multiple: notes: handle multiple worktrees worktrees: add find_shared_symref | 25 August 2015, 21:57:08 UTC |
| 5d5be81 | Junio C Hamano | 25 August 2015, 21:57:07 UTC | Merge branch 'nd/dwim-wildcards-as-pathspecs' Test updates for Windows. * nd/dwim-wildcards-as-pathspecs: t2019: skip test requiring '*' in a file name non Windows | 25 August 2015, 21:57:07 UTC |
| 1302c9f | Junio C Hamano | 25 August 2015, 21:57:06 UTC | Merge branch 'jk/long-error-messages' The codepath to produce error messages had a hard-coded limit to the size of the message, primarily to avoid memory allocation while calling die(). * jk/long-error-messages: vreportf: avoid intermediate buffer vreportf: report to arbitrary filehandles | 25 August 2015, 21:57:06 UTC |
| b590720 | Junio C Hamano | 25 August 2015, 21:57:06 UTC | Merge branch 'ee/clean-remove-dirs' Test updates for Windows. * ee/clean-remove-dirs: t7300-clean: require POSIXPERM for chmod 0 test | 25 August 2015, 21:57:06 UTC |
| 3b281d1 | Junio C Hamano | 25 August 2015, 21:57:05 UTC | Merge branch 'jh/strbuf-read-use-read-in-full' strbuf_read() used to have one extra iteration (and an unnecessary strbuf_grow() of 8kB), which was eliminated. * jh/strbuf-read-use-read-in-full: strbuf_read(): skip unnecessary strbuf_grow() at eof | 25 August 2015, 21:57:06 UTC |
| 3acf8dd | Junio C Hamano | 20 August 2015, 22:51:45 UTC | builtin/log.c: minor reformat Two logical lines that were not overly long was split in the middle, which made them read worse. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 August 2015, 20:11:21 UTC |
| 1f76a10 | Junio C Hamano | 24 August 2015, 20:20:39 UTC | write_file(): drop caller-supplied LF from calls to create a one-liner file All of the callsites covered by this change call write_file() or write_file_gently() to create a one-liner file. Drop the caller supplied LF and let these callees to append it as necessary. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 August 2015, 19:49:19 UTC |
| e7ffa38 | Junio C Hamano | 24 August 2015, 16:39:48 UTC | write_file_v(): do not leave incomplete line at the end All existing callers to this function use it to produce a text file or an empty file, and a new callsite that mimick them must end their payload with a LF. If they forget to do so, the resulting file will end with an incomplete line. Teach write_file_v() to complete the incomplete line, if exists, so that the callers do not have to. With this, the caller-side fix in builtin/am.c becomes unnecessary. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 August 2015, 19:48:39 UTC |
| 82aec45 | Eric Sunshine | 23 August 2015, 21:31:09 UTC | generate-cmdlist: re-implement as shell script 527ec39 (generate-cmdlist: parse common group commands, 2015-05-21) replaced generate-cmdlist.sh with a more functional Perl version, generate-cmdlist.perl. The Perl version gleans named tags from a new "common groups" section in command-list.txt and recognizes those tags in "command list" section entries in place of the old 'common' tag. This allows git-help to, not only recognize, but also group common commands. Although the tests require Perl, 527ec39 creates an unconditional dependence upon Perl in the build system itself, which can not be overridden with NO_PERL. Such a dependency may be undesirable; for instance, the 'git-lite' package in the FreeBSD ports tree is intended as a minimal Git installation (which may, for example, be useful on servers needing only local clone and update capability), which, historically, has not depended upon Perl[1]. Therefore, revive generate-cmdlist.sh and extend it to recognize "common groups" and its named tags. Retire generate-cmdlist.perl. [1]: http://thread.gmane.org/gmane.comp.version-control.git/275905/focus=276132 Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 August 2015, 18:24:31 UTC |
| 82fde87 | Nguyễn Thái Ngọc Duy | 25 August 2015, 10:30:46 UTC | setup: update the right file in multiple checkouts This code is introduced in 23af91d (prune: strategies for linked checkouts - 2014-11-30), and it's supposed to implement this rule from that commit's message: - linked checkouts are supposed to keep its location in $R/gitdir up to date. The use case is auto fixup after a manual checkout move. Note the name, "$R/gitdir", not "$R/gitfile". Correct the path to be updated accordingly. While at there, make sure I/O errors are not silently dropped. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 August 2015, 16:39:08 UTC |
| 2bd0706 | SZEDER Gábor | 24 August 2015, 16:15:18 UTC | describe --contains: default to HEAD when no commit-ish is given 'git describe --contains' doesn't default to HEAD when no commit is given, and it doesn't produce any output, not even an error: ~/src/git ((v2.5.0))$ ./git describe --contains ~/src/git ((v2.5.0))$ ./git describe --contains HEAD v2.5.0^0 Unlike other 'git describe' options, the '--contains' code path is implemented by calling 'name-rev' with a bunch of options plus all the commit-ishes that were passed to 'git describe'. If no commit-ish was present, then 'name-rev' got invoked with none, which then leads to the behavior illustrated above. Porcelain commands usually default to HEAD when no commit-ish is given, and 'git describe' already does so in all other cases, so it should do so with '--contains' as well. Pass HEAD to 'name-rev' when no commit-ish is given on the command line to make '--contains' behave consistently with other 'git describe' options. While at it, use argv_array_pushv() instead of the loop to pass commit-ishes to 'git name-rev'. 'git describe's short help already indicates that the commit-ish is optional, but the synopsis in the man page doesn't, so update it accordingly as well. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 August 2015, 16:35:13 UTC |
| 12d6ce1 | Junio C Hamano | 24 August 2015, 20:03:07 UTC | write_file(): drop "fatal" parameter All callers except three passed 1 for the "fatal" parameter to ask this function to die upon error, but to a casual reader of the code, it was not all obvious what that 1 meant. Instead, split the function into two based on a common write_file_v() that takes the flag, introduce write_file_gently() as a new way to attempt creating a file without dying on error, and make three callers to call it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2015, 20:09:02 UTC |
| 57c867e | Junio C Hamano | 24 August 2015, 16:43:41 UTC | builtin/am: make sure state files are text We forgot to terminate the payload given to write_file() with LF, resulting in files that end with an incomplete line. Teach the wrappers builtin/am uses to make sure it adds LF at the end as necessary. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2015, 20:01:59 UTC |
| 25b763b | Junio C Hamano | 24 August 2015, 16:12:53 UTC | builtin/am: introduce write_state_*() helper functions There are many calls to write_file() that repeat the same pattern in the implementation of the builtin version of "am". They all share the same traits, i.e they - produce a text file with a single string in it; - have enough information to produce the entire contents of that file; - generate the pathname of the file by making a call to am_path(); and - they ask write_file() to die() upon failure. The slight differences among the call sites throw them into roughly three categories: - many write either "t" or "f" based on a boolean value to a file; - some write the integer value in decimal text; - some others write more general string, e.g. an object name in hex, an empty string (i.e. the presense of the file itself serves as a flag), etc. Introduce three helpers, write_state_bool(), write_state_count() and write_state_text(), to reduce direct calls to write_file(). This is a preparatory step for the next step to ensure that no "state" file this command leaves in $GIT_DIR is with an incomplete line at the end. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2015, 18:18:59 UTC |
| 2aea7a5 | Jeff King | 23 August 2015, 17:56:40 UTC | rev-list: make it obvious that we do not support notes The rev-list command does not have the internal infrastructure to display notes. Running: git rev-list --notes HEAD will silently ignore the "--notes" option. Running: git rev-list --notes --grep=. HEAD will crash on an assert. Running: git rev-list --format=%N HEAD will place a literal "%N" in the output (it does not even expand to an empty string). Let's have rev-list tell the user that it cannot fill the user's request, rather than silently producing wrong data. Likewise, let's remove mention of the notes options from the rev-list documentation. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2015, 17:33:15 UTC |
| 9e9de18 | Jeff King | 24 August 2015, 06:11:33 UTC | config: silence warnings for command names with invalid keys When we are running the git command "foo", we may have to look up the config keys "pager.foo" and "alias.foo". These config schemes are mis-designed, as the command names can be anything, but the config syntax has some restrictions. For example: $ git foo_bar error: invalid key: pager.foo_bar error: invalid key: alias.foo_bar git: 'foo_bar' is not a git command. See 'git --help'. You cannot name an alias with an underscore. And if you have an external command with one, you cannot configure its pager. In the long run, we may develop a different config scheme for these features. But in the near term (and because we'll need to support the existing scheme indefinitely), we should at least squelch the error messages shown above. These errors come from git_config_parse_key. Ideally we would pass a "quiet" flag to the config machinery, but there are many layers between the pager code and the key parsing. Passing a flag through all of those would be an invasive change. Instead, let's provide a config function to report on whether a key is syntactically valid, and have the pager and alias code skip lookup for bogus keys. We can build this easily around the existing git_config_parse_key, with two minor modifications: 1. We now handle a NULL store_key, to validate but not write out the normalized key. 2. We accept a "quiet" flag to avoid writing to stderr. This doesn't need to be a full-blown public "flags" field, because we can make the existing implementation a static helper function, keeping the mess contained inside config.c. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2015, 15:52:23 UTC |
| 7aa9b9b | SZEDER Gábor | 20 August 2015, 14:06:27 UTC | wt-status: move #include "pathspec.h" to the header The declaration of 'struct wt_status' requires the declararion of 'struct pathspec'. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 August 2015, 21:49:27 UTC |
| dc5d553 | Christian Couder | 20 August 2015, 21:59:15 UTC | trailer: ignore first line of message When looking for the start of the trailers in the message we are passed, we should ignore the first line of the message. The reason is that if we are passed a patch or commit message then the first line should be the patch title. If we are passed only trailers we can expect that they start with an empty line that can be ignored too. This way we can properly process commit messages that have only one line with something that looks like a trailer, for example like "area of code: change we made". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 August 2015, 17:17:47 UTC |
| f04c690 | Andreas Schwab | 21 August 2015, 15:06:18 UTC | Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachable Change <ref> to <pattern> in the description of gc.*.reflogExpireUnreachable, since that is what the text refers to. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 August 2015, 17:15:13 UTC |
| 82dee41 | Junio C Hamano | 20 August 2015, 21:36:49 UTC | log: show merge commit when --cc is given We defaulted to ignoring merge diffs because long long ago, in a galaxy far away, we didn't have a great way to show the diffs. The whole "--cc" option goes back to January '06 and commit d8f4790e6fe7 ("diff-tree --cc: denser combined diff output for a merge commit"). And before that option - so for about 8 months - we had no good way to show the diffs of merges in a good dense way. So the whole "don't show diffs for merges by default" actually made a lot of sense originally, because our merge diffs were not very useful. And this was carried forward to this day. "git log --cc" still ignores merge commits, and you need to say "git log -m --cc" to view a sensible rendition of merge and non-merge commits, even with the previous change to make "--cc" imply "-p". Teach "git log" that "--cc" means the user wants to see interesting changes in merge commits by turning "-m" on. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2015, 22:06:04 UTC |
| c7eaf8b | Junio C Hamano | 20 August 2015, 21:36:49 UTC | log: when --cc is given, default to -p unless told otherwise The "--cc" option to "git log" is clearly a request to show some sort of combined diff (be it --patch or --raw), but traditionally we required the command line to explicitly ask for "git log -p --cc". Teach the command line parser to treat a lone "--cc" as if the user specified "-p --cc". Formats that do ask for other forms of diff output, e.g. "log --raw --cc", are not overriden. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2015, 22:03:57 UTC |
| b130c70 | Junio C Hamano | 20 August 2015, 21:14:46 UTC | log: rename "tweak" helpers The revision walking API allows the callers to tweak its configuration at the last minute, immediately after all the revision and pathspec parameters are parsed from the command line but before the default actions are decided based on them, by defining a "tweak" callback function when calling setup_revisions(). Traditionally, this facility was used by "git show" to turn on the patch output "-p" by default when no diff output option (e.g. "--raw" or "-s" to squelch the output altogether) is given on the command line, and further give dense combined diffs "--cc" for merge commits when no option to countermand it (e.g. "-m" to show pairwise patches). Recently, "git log" started using the same facility, but we named the callback function "default_follow_tweak()", as if the only kind of tweaking we would want for "git log" will forever be limited to turning "--follow" on by default when told by a configuration variable. That was myopic. Rename it to more generic name "log_setup_revisions_tweak()", and match the one used by show "show_setup_revisions_tweak()". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2015, 21:23:05 UTC |
| a92330d | Jeff King | 20 August 2015, 14:49:45 UTC | get_urlmatch: avoid useless strbuf write We create a strbuf only to insert a single string, pass the resulting buffer to a function (which does not modify the string), and then free it. We can just pass the original string instead. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2015, 20:16:50 UTC |
| f225987 | Jeff King | 20 August 2015, 14:47:34 UTC | format_config: simplify buffer handling When formatting a config value into a strbuf, we may end up stringifying it into a fixed-size buffer using sprintf, and then copying that buffer into the strbuf. We can eliminate the middle-man (and drop some calls to sprintf!) by writing directly to the strbuf. The reason it was written this way in the first place is that we need to know before writing the value whether to insert a delimiter. Instead of delaying the write of the value, we speculatively write the delimiter, and roll it back in the single case that cares. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2015, 20:16:50 UTC |
| 9f1429d | Jeff King | 20 August 2015, 14:46:04 UTC | format_config: don't init strbuf It's unusual for a function which writes to a passed-in strbuf to call strbuf_init; that will throw away anything already there, leaking memory. In this case, there are exactly two callers; one relies on this initialization and the other passes in an already-initialized buffer. There's no leak, as the initialized buffer doesn't have anything in it. But let's bump the strbuf_init out to the one caller who needs it, making format_config more idiomatic. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2015, 20:16:50 UTC |
| ebca2d4 | SZEDER Gábor | 20 August 2015, 14:14:22 UTC | config: restructure format_config() for better control flow Commit 578625fa91 (config: add '--name-only' option to list only variable names, 2015-08-10) modified format_config() such that it returned from the middle of the function when showing only keys, resulting in ugly code structure. Reorganize the if statements and dealing with the key-value delimiter to make the function easier to read. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2015, 20:15:17 UTC |
| 1269847 | SZEDER Gábor | 20 August 2015, 13:58:55 UTC | t3020: fix typo in test description Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2015, 20:14:21 UTC |
