| 0e8c092 | Junio C Hamano | 25 March 2014, 18:08:19 UTC | Merge branch 'nd/index-pack-error-message' * nd/index-pack-error-message: index-pack: report error using the correct variable | 25 March 2014, 18:08:19 UTC |
| 66d9133 | Junio C Hamano | 25 March 2014, 18:08:09 UTC | Merge branch 'jk/lib-terminal-lazy' The test helper lib-terminal always run an actual test_expect_* when included, which screwed up with the use of skil-all that may have to be done later. * jk/lib-terminal-lazy: t/lib-terminal: make TTY a lazy prerequisite | 25 March 2014, 18:08:09 UTC |
| 2f2db83 | Junio C Hamano | 25 March 2014, 18:07:51 UTC | Merge branch 'dm/configure-iconv-locale-charset' * dm/configure-iconv-locale-charset: configure.ac: link with -liconv for locale_charset() | 25 March 2014, 18:07:51 UTC |
| 46c0f91 | Junio C Hamano | 25 March 2014, 18:07:47 UTC | Merge branch 'nd/commit-editor-cleanup' "git commit --cleanup=<mode>" learned a new mode, scissors. * nd/commit-editor-cleanup: commit: add --cleanup=scissors wt-status.c: move cut-line print code out to wt_status_add_cut_line wt-status.c: make cut_line[] const to shrink .data section a bit | 25 March 2014, 18:07:48 UTC |
| d4c6e9f | Junio C Hamano | 25 March 2014, 18:07:36 UTC | Merge branch 'jk/warn-on-object-refname-ambiguity' * jk/warn-on-object-refname-ambiguity: rev-list: disable object/refname ambiguity check with --stdin cat-file: restore warn_on_object_refname_ambiguity flag cat-file: fix a minor memory leak in batch_objects cat-file: refactor error handling of batch_objects | 25 March 2014, 18:07:36 UTC |
| ec8cd4f | Junio C Hamano | 25 March 2014, 18:07:09 UTC | Merge branch 'mh/remove-subtree-long-pathname-fix' * mh/remove-subtree-long-pathname-fix: entry.c: fix possible buffer overflow in remove_subtree() checkout_entry(): use the strbuf throughout the function | 25 March 2014, 18:07:09 UTC |
| 34a2e88 | Junio C Hamano | 25 March 2014, 18:07:05 UTC | Merge branch 'nd/indent-fix-connect-c' * nd/indent-fix-connect-c: connect.c: SP after "}", not TAB | 25 March 2014, 18:07:06 UTC |
| 12de60a | Junio C Hamano | 25 March 2014, 18:02:01 UTC | Merge branch 'jk/mv-submodules-fix' "git mv" that moves a submodule forgot to adjust the array that uses to keep track of which submodules were to be moved to update its configuration. * jk/mv-submodules-fix: mv: prevent mismatched data when ignoring errors. builtin/mv: fix out of bounds write | 25 March 2014, 18:02:02 UTC |
| 2dfefe0 | Junio C Hamano | 25 March 2014, 18:01:31 UTC | Merge branch 'cp/am-patch-format-doc' * cp/am-patch-format-doc: Documentation/git-am: typofix Documentation/git-am: Document supported --patch-format options | 25 March 2014, 18:01:31 UTC |
| 3f09db0 | Junio C Hamano | 21 March 2014, 20:41:27 UTC | Update draft release notes to 2.0 | 21 March 2014, 20:41:27 UTC |
| fe3623c | Junio C Hamano | 21 March 2014, 19:50:44 UTC | Merge branch 'lt/request-pull' Discard the accumulated "heuristics" to guess from which branch the result wants to be pulled from and make sure what the end user specified is not second-guessed by "git request-pull", to avoid mistakes. * lt/request-pull: request-pull: documentation updates request-pull: resurrect "pretty refname" feature request-pull: test updates request-pull: pick up tag message as before request-pull: allow "local:remote" to specify names on both ends request-pull: more strictly match local/remote branches | 21 March 2014, 19:50:44 UTC |
| 53d7d1b | Junio C Hamano | 21 March 2014, 19:50:39 UTC | Merge branch 'es/sh-i18n-envsubst' * es/sh-i18n-envsubst: sh-i18n--envsubst: retire unused string_list_member() | 21 March 2014, 19:50:39 UTC |
| 1ddb4d7 | Junio C Hamano | 21 March 2014, 19:49:08 UTC | Merge branch 'nd/upload-pack-shallow' Serving objects from a shallow repository needs to write a temporary file to be used, but the serving upload-pack may not have write access to the repository which is meant to be read-only. Instead feed these temporary shallow bounds from the standard input of pack-objects so that we do not have to use a temporary file. * nd/upload-pack-shallow: upload-pack: send shallow info over stdin to pack-objects | 21 March 2014, 19:49:08 UTC |
| 6dada01 | Junio C Hamano | 21 March 2014, 19:48:59 UTC | Merge branch 'jn/wt-status' Unify the codepaths that format new/modified/changed sections and conflicted paths in the "git status" output and make it possible to properly internationalize their output. * jn/wt-status: wt-status: lift the artificual "at least 20 columns" floor wt-status: i18n of section labels wt-status: extract the code to compute width for labels wt-status: make full label string to be subject to l10n | 21 March 2014, 19:48:59 UTC |
| 10bdb20 | Junio C Hamano | 21 March 2014, 19:48:51 UTC | Merge branch 'jc/stash-pop-not-popped' "stash pop", upon failing to apply the stash, refrains from discarding the stash to avoid information loss. Be more explicit in the error message. The wording may want to get a bit more bikeshedding. * jc/stash-pop-not-popped: stash pop: mention we did not drop the stash upon failing to apply | 21 March 2014, 19:48:51 UTC |
| 1be645c | Junio C Hamano | 21 March 2014, 19:47:41 UTC | Merge branch 'dk/skip-prefix-scan-only-once' Update implementation of skip_prefix() to scan only once; given that most "prefix" arguments to the inline function are constant strings whose strlen() can be determined at the compile time, this might actually make things worse with a compiler with sufficient intelligence. * dk/skip-prefix-scan-only-once: skip_prefix(): scan prefix only once | 21 March 2014, 19:47:41 UTC |
| b6de0c6 | Junio C Hamano | 21 March 2014, 19:47:38 UTC | Merge branch 'nd/tag-version-sort' Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output. * nd/tag-version-sort: tag: support --sort=<spec> | 21 March 2014, 19:47:39 UTC |
| 3e14384 | Junio C Hamano | 21 March 2014, 19:33:29 UTC | Merge branch 'jk/shallow-update-fix' Serving objects from a shallow repository needs to write a new file to hold the temporary shallow boundaries but it was not cleaned when we exit due to die() or a signal. * jk/shallow-update-fix: shallow: verify shallow file after taking lock shallow: automatically clean up shallow tempfiles shallow: use stat_validity to check for up-to-date file | 21 March 2014, 19:33:29 UTC |
| 4291cc1 | Junio C Hamano | 21 March 2014, 19:33:25 UTC | Merge branch 'tc/commit-dry-run-exit-status-tests' * tc/commit-dry-run-exit-status-tests: demonstrate git-commit --dry-run exit code behaviour | 21 March 2014, 19:33:25 UTC |
| 5172cb3 | Junio C Hamano | 18 March 2014, 21:34:25 UTC | Sync with 1.9.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2014, 21:34:25 UTC |
| a35104f | Junio C Hamano | 18 March 2014, 21:33:34 UTC | Update draft release notes to Git 2.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2014, 21:33:34 UTC |
| cee0c27 | Junio C Hamano | 18 March 2014, 21:06:49 UTC | Git 1.9.1 The version numbering scheme has changed since Git 1.9 and we dropped the third dewey-decimal from the traditional numbering (e.g. both 1.8.4 and 1.8.5 were major feature releases). This release 1.9.1 is the first maintenance relase for Git 1.9. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2014, 21:16:16 UTC |
| 9526473 | Junio C Hamano | 18 March 2014, 21:04:59 UTC | Merge branch 'jk/clean-d-pathspec' into maint "git clean -d pathspec" did not use the given pathspec correctly and ended up cleaning too much. * jk/clean-d-pathspec: clean: simplify dir/not-dir logic clean: respect pathspecs with "-d" | 18 March 2014, 21:04:59 UTC |
| 01e13d0 | Junio C Hamano | 18 March 2014, 21:04:36 UTC | Merge branch 'da/difftool-git-files' into maint "git difftool" misbehaved when the repository is bound to the working tree with the ".git file" mechanism, where a textual file ".git" tells us where it is. * da/difftool-git-files: t7800: add a difftool test for .git-files difftool: support repositories with .git-files | 18 March 2014, 21:04:36 UTC |
| 4097a25 | Junio C Hamano | 18 March 2014, 21:04:16 UTC | Merge branch 'jk/remote-pushremote-config-reading' into maint "git push" did not pay attention to branch.*.pushremote if it is defined earlier than remote.pushdefault; the order of these two variables in the configuration file should not matter, but it did by mistake. * jk/remote-pushremote-config-reading: remote: handle pushremote config in any order | 18 March 2014, 21:04:16 UTC |
| 8aac6c9 | Junio C Hamano | 18 March 2014, 21:04:01 UTC | Merge branch 'jk/commit-dates-parsing-fix' into maint Codepaths that parse timestamps in commit objects have been tightened. * jk/commit-dates-parsing-fix: show_ident_date: fix tz range check log: do not segfault on gmtime errors log: handle integer overflow in timestamps date: check date overflow against time_t fsck: report integer overflow in author timestamps t4212: test bogus timestamps with git-log | 18 March 2014, 21:04:01 UTC |
| a5aca6e | Junio C Hamano | 18 March 2014, 21:03:41 UTC | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint "git diff --external-diff" incorrectly fed the submodule directory in the working tree to the external diff driver when it knew it is the same as one of the versions being compared. * tr/diff-submodule-no-reuse-worktree: diff: do not reuse_worktree_file for submodules | 18 March 2014, 21:03:41 UTC |
| 1f56977 | Junio C Hamano | 18 March 2014, 21:03:24 UTC | Merge branch 'nd/reset-setup-worktree' into maint "git reset" needs to refresh the index when working in a working tree (it can also be used to match the index to the HEAD in an otherwise bare repository), but it failed to set up the working tree properly, causing GIT_WORK_TREE to be ignored. * nd/reset-setup-worktree: reset: optionally setup worktree and refresh index on --mixed | 18 March 2014, 21:03:24 UTC |
| a8b3131 | Junio C Hamano | 18 March 2014, 21:03:03 UTC | Merge branch 'jc/check-attr-honor-working-tree' into maint "git check-attr" when working on a repository with a working tree did not work well when the working tree was specified via the --work-tree (and obviously with --git-dir) option. * jc/check-attr-honor-working-tree: check-attr: move to the top of working tree when in non-bare repository t0003: do not chdir the whole test process | 18 March 2014, 21:03:03 UTC |
| 6d011b8 | Junio C Hamano | 18 March 2014, 21:02:37 UTC | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint "merge-recursive" was broken in 1.7.7 era and stopped working in an empty (temporary) working tree, when there are renames involved. This has been corrected. * bk/refresh-missing-ok-in-merge-recursive: merge-recursive.c: tolerate missing files while refreshing index read-cache.c: extend make_cache_entry refresh flag with options read-cache.c: refactor --ignore-missing implementation t3030-merge-recursive: test known breakage with empty work tree | 18 March 2014, 21:02:38 UTC |
| c7b3173 | Junio C Hamano | 18 March 2014, 21:01:05 UTC | Merge branch 'ds/rev-parse-required-args' into maint "git rev-parse" was loose in rejecting command line arguments that do not make sense, e.g. "--default" without the required value for that option. * ds/rev-parse-required-args: rev-parse: check i before using argv[i] against argc | 18 March 2014, 21:01:05 UTC |
| 6f01667 | Junio C Hamano | 18 March 2014, 21:00:15 UTC | Merge branch 'jk/config-path-include-fix' into maint include.path variable (or any variable that expects a path that can use ~username expansion) in the configuration file is not a boolean, but the code failed to check it. * jk/config-path-include-fix: handle_path_include: don't look at NULL value expand_user_path: do not look at NULL path | 18 March 2014, 21:00:15 UTC |
| 34120a5 | Junio C Hamano | 18 March 2014, 20:59:55 UTC | Merge branch 'nd/diff-quiet-stat-dirty' into maint "git diff --quiet -- pathspec1 pathspec2" sometimes did not return correct status value. * nd/diff-quiet-stat-dirty: diff: do not quit early on stat-dirty files diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later | 18 March 2014, 20:59:56 UTC |
| 1030d4c | Junio C Hamano | 18 March 2014, 20:59:37 UTC | Merge branch 'nd/http-fetch-shallow-fix' into maint Attempting to deepen a shallow repository by fetching over smart HTTP transport failed in the protocol exchange, when no-done extension was used. The fetching side waited for the list of shallow boundary commits after the sending end stopped talking to it. * nd/http-fetch-shallow-fix: t5537: move http tests out to t5539 fetch-pack: fix deepen shallow over smart http with no-done cap protocol-capabilities.txt: document no-done protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txt pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done' test: rename http fetch and push test files tests: auto-set LIB_HTTPD_PORT from test name | 18 March 2014, 20:59:37 UTC |
| 6a0556e | Junio C Hamano | 18 March 2014, 20:58:58 UTC | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maint Allow "git cmd path/", when the 'path' is where a submodule is bound to the top-level working tree, to match 'path', despite the extra and unnecessary trailing slash (such a slash is often given by command line completion). * nd/submodule-pathspec-ending-with-slash: clean: use cache_name_is_other() clean: replace match_pathspec() with dir_path_match() pathspec: pass directory indicator to match_pathspec_item() match_pathspec: match pathspec "foo/" against directory "foo" dir.c: prepare match_pathspec_item for taking more flags pathspec: rename match_pathspec_depth() to match_pathspec() pathspec: convert some match_pathspec_depth() to dir_path_match() pathspec: convert some match_pathspec_depth() to ce_path_match() | 18 March 2014, 20:58:58 UTC |
| 6f6be80 | Junio C Hamano | 18 March 2014, 20:51:20 UTC | Merge branch 'rs/grep-h-c' "git grep" learns to handle combination of "-h (no header)" and "-c (counts)". * rs/grep-h-c: grep: support -h (no header) with --count t7810: add missing variables to tests in loop | 18 March 2014, 20:51:20 UTC |
| 6f75e48 | Junio C Hamano | 18 March 2014, 20:51:18 UTC | Merge branch 'rm/strchrnul-not-strlen' * rm/strchrnul-not-strlen: use strchrnul() in place of strchr() and strlen() | 18 March 2014, 20:51:18 UTC |
| 884377c | Junio C Hamano | 18 March 2014, 20:51:14 UTC | Merge branch 'jc/tag-contains-with' * jc/tag-contains-with: tag: grok "--with" as synonym to "--contains" | 18 March 2014, 20:51:15 UTC |
| 9cf0137 | Junio C Hamano | 18 March 2014, 20:51:09 UTC | Merge branch 'bg/install-branch-config-skip-prefix' * bg/install-branch-config-skip-prefix: branch: use skip_prefix() in install_branch_config() t3200-branch: test setting branch as own upstream | 18 March 2014, 20:51:09 UTC |
| 1c18a14 | Junio C Hamano | 18 March 2014, 20:51:07 UTC | Merge branch 'jc/no-need-for-env-in-sh-scripts' * jc/no-need-for-env-in-sh-scripts: *.sh: drop useless use of "env" | 18 March 2014, 20:51:07 UTC |
| 006f678 | Junio C Hamano | 18 March 2014, 20:51:04 UTC | Merge branch 'sh/use-hashcpy' * sh/use-hashcpy: Use hashcpy() when copying object names | 18 March 2014, 20:51:05 UTC |
| da2e057 | Junio C Hamano | 18 March 2014, 20:51:02 UTC | Merge branch 'mh/simplify-cache-tree-find' * mh/simplify-cache-tree-find: cache_tree_find(): use path variable when passing over slashes cache_tree_find(): remove early return cache_tree_find(): remove redundant check cache_tree_find(): fix comment formatting cache_tree_find(): find the end of path component using strchrnul() cache_tree_find(): remove redundant checks | 18 March 2014, 20:51:02 UTC |
| 6bd3424 | Junio C Hamano | 18 March 2014, 20:50:48 UTC | Merge branch 'jn/branch-lift-unnecessary-name-length-limit' * jn/branch-lift-unnecessary-name-length-limit: branch.c: delete size check of newly tracked branch names | 18 March 2014, 20:50:48 UTC |
| c0cca58 | Junio C Hamano | 18 March 2014, 20:50:40 UTC | Merge branch 'jk/doc-deprecate-grafts' * jk/doc-deprecate-grafts: docs: mark info/grafts as outdated | 18 March 2014, 20:50:40 UTC |
| 9befb34 | Junio C Hamano | 18 March 2014, 20:50:33 UTC | Merge branch 'jk/detect-push-typo-early' Catch "git push $there no-such-branch" early. * jk/detect-push-typo-early: push: detect local refspec errors early match_explicit_lhs: allow a "verify only" mode match_explicit: hoist refspec lhs checks into their own function | 18 March 2014, 20:50:33 UTC |
| 249d54b | Junio C Hamano | 18 March 2014, 20:50:29 UTC | Merge branch 'jk/repack-pack-keep-objects' * jk/repack-pack-keep-objects: repack: add `repack.packKeptObjects` config var | 18 March 2014, 20:50:29 UTC |
| f4eec8c | Junio C Hamano | 18 March 2014, 20:50:24 UTC | Merge branch 'sh/finish-tmp-packfile' * sh/finish-tmp-packfile: finish_tmp_packfile():use strbuf for pathname construction | 18 March 2014, 20:50:24 UTC |
| fe9122a | Junio C Hamano | 18 March 2014, 20:50:21 UTC | Merge branch 'dd/use-alloc-grow' Replace open-coded reallocation with ALLOC_GROW() macro. * dd/use-alloc-grow: sha1_file.c: use ALLOC_GROW() in pretend_sha1_file() read-cache.c: use ALLOC_GROW() in add_index_entry() builtin/mktree.c: use ALLOC_GROW() in append_to_tree() attr.c: use ALLOC_GROW() in handle_attr_line() dir.c: use ALLOC_GROW() in create_simplify() reflog-walk.c: use ALLOC_GROW() replace_object.c: use ALLOC_GROW() in register_replace_object() patch-ids.c: use ALLOC_GROW() in add_commit() diffcore-rename.c: use ALLOC_GROW() diff.c: use ALLOC_GROW() commit.c: use ALLOC_GROW() in register_commit_graft() cache-tree.c: use ALLOC_GROW() in find_subtree() bundle.c: use ALLOC_GROW() in add_to_ref_list() builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path() | 18 March 2014, 20:50:21 UTC |
| a8e1d71 | Junio C Hamano | 18 March 2014, 20:50:11 UTC | Merge branch 'dd/find-graft-with-sha1-pos' Replace a hand-rolled binary search with a call to our generic binary search helper function. * dd/find-graft-with-sha1-pos: commit.c: use the generic "sha1_pos" function for lookup | 18 March 2014, 20:50:11 UTC |
| 90e6255 | Junio C Hamano | 18 March 2014, 20:49:32 UTC | Merge branch 'fc/transport-helper-fixes' Updates transport-helper, fast-import and fast-export to allow the ref mapping and ref deletion in a way similar to the natively supported transports. * fc/transport-helper-fixes: remote-bzr: support the new 'force' option test-hg.sh: tests are now expected to pass transport-helper.c: do not overwrite forced bit transport-helper: check for 'forced update' message transport-helper: add 'force' to 'export' helpers transport-helper: don't update refs in dry-run transport-helper: mismerge fix | 18 March 2014, 20:49:33 UTC |
| decba94 | Junio C Hamano | 18 March 2014, 20:49:22 UTC | Merge branch 'nd/sha1-file-delta-stack-leakage-fix' Fix a small leak in the delta stack used when resolving a long delta chain at runtime. * nd/sha1-file-delta-stack-leakage-fix: sha1_file: fix delta_stack memory leak in unpack_entry | 18 March 2014, 20:49:23 UTC |
| 9b34767 | Junio C Hamano | 18 March 2014, 20:48:50 UTC | Merge branch 'jk/diff-filespec-cleanup' Portability fix to a topic already in v1.9 * jk/diff-filespec-cleanup: diffcore.h: be explicit about the signedness of is_binary | 18 March 2014, 20:48:50 UTC |
| 15520a8 | Junio C Hamano | 18 March 2014, 20:47:57 UTC | Merge branch 'jk/clean-d-pathspec' "git clean -d pathspec" did not use the given pathspec correctly and ended up cleaning too much. * jk/clean-d-pathspec: clean: simplify dir/not-dir logic clean: respect pathspecs with "-d" | 18 March 2014, 20:47:57 UTC |
| de983a0 | Junio C Hamano | 17 March 2014, 22:08:36 UTC | index-pack: report error using the correct variable We feed a string pointer that is potentially NULL to die() when showing the message. Don't. Noticed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2014, 22:08:36 UTC |
| f5b6ffa | Chris Packham | 17 March 2014, 07:50:49 UTC | Documentation/git-am: typofix Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2014, 22:04:12 UTC |
| 7839632 | Jeff King | 15 March 2014, 03:47:06 UTC | shallow: verify shallow file after taking lock Before writing the shallow file, we stat() the existing file to make sure it has not been updated since our operation began. However, we do not do so under a lock, so there is a possible race: 1. Process A takes the lock. 2. Process B calls check_shallow_file_for_update and finds no update. 3. Process A commits the lockfile. 4. Process B takes the lock, then overwrite's process A's changes. We can fix this by doing our check while we hold the lock. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2014, 22:03:32 UTC |
| fb8a4e8 | brian m. carlson | 15 March 2014, 18:56:52 UTC | mv: prevent mismatched data when ignoring errors. We shrink the source and destination arrays, but not the modes or submodule_gitfile arrays, resulting in potentially mismatched data. Shrink all the arrays at the same time to prevent this. Add tests to ensure the problem does not recur. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2014, 18:38:41 UTC |
| 7e27173 | Jeff King | 14 March 2014, 21:57:23 UTC | t/lib-terminal: make TTY a lazy prerequisite When lib-terminal.sh is sourced by a test script, we immediately set up the TTY prerequisite. We do so inside a test_expect_success, because that nicely isolates any generated output. However, this early test can interfere with a script that later wants to skip all tests (e.g., t5541 then goes on to set up the httpd server, and wants to skip_all if that fails). TAP output doesn't let us skip everything after we have already run at least one test. We could fix this by reordering the inclusion of lib-terminal.sh in t5541 to go after the httpd setup. That solves this case, but we might eventually hit a case with circular dependencies, where either lib-*.sh include might want to skip_all after the other has run a test. So instead, let's just remove the ordering constraint entirely by doing the setup inside a test_lazy_prereq construct, rather than in a regular test. We never cared about the test outcome anyway (it was written to always succeed). Note that in addition to setting up the prerequisite, the current test also defines test_terminal. Since we can't affect the environment from a lazy_prereq, we have to hoist that out. We previously depended on it _not_ being defined when the TTY prereq isn't set as a way to ensure that tests properly declare their dependency on TTY. However, we still cover the case (see the in-code comment for details). Reported-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2014, 22:23:49 UTC |
| 00eda23 | Junio C Hamano | 13 March 2014, 21:01:17 UTC | Update draft release notes to Git 2.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2014, 21:27:26 UTC |
| 27ac2b1 | Junio C Hamano | 14 March 2014, 21:27:23 UTC | Merge branch 'ta/parse-commit-with-skip-prefix' * ta/parse-commit-with-skip-prefix: commit.c: use skip_prefix() instead of starts_with() | 14 March 2014, 21:27:23 UTC |
| e8cb499 | Junio C Hamano | 14 March 2014, 21:27:21 UTC | Merge branch 'sr/add--interactive-term-readkey' * sr/add--interactive-term-readkey: git-add--interactive: warn if module for interactive.singlekey is missing git-config: document interactive.singlekey requires Term::ReadKey | 14 March 2014, 21:27:21 UTC |
| 56e2874 | Junio C Hamano | 14 March 2014, 21:27:16 UTC | Merge branch 'sh/write-pack-file-warning-message-fix' A warning from "git pack-objects" were generated by referring to an incorrect variable when forming the filename that we had trouble with. * sh/write-pack-file-warning-message-fix: write_pack_file: use correct variable in diagnostic | 14 March 2014, 21:27:17 UTC |
| 27c2c2e | Junio C Hamano | 14 March 2014, 21:27:13 UTC | Merge branch 'nd/strbuf-inline-styles' * nd/strbuf-inline-styles: strbuf: style fix -- top opening bracket on a separate line | 14 March 2014, 21:27:13 UTC |
| 117a355 | Junio C Hamano | 14 March 2014, 21:27:11 UTC | Merge branch 'jn/bisect-coding-style' * jn/bisect-coding-style: git-bisect.sh: fix a few style issues | 14 March 2014, 21:27:11 UTC |
| 3e30cb0 | Junio C Hamano | 14 March 2014, 21:27:06 UTC | Merge branch 'mh/replace-refs-variable-rename' * mh/replace-refs-variable-rename: Document some functions defined in object.c Add docstrings for lookup_replace_object() and do_lookup_replace_object() rename read_replace_refs to check_replace_refs | 14 March 2014, 21:27:06 UTC |
| d552f8d | Junio C Hamano | 14 March 2014, 21:27:02 UTC | Merge branch 'sg/archive-restrict-remote' Allow loosening remote "git archive" invocation security check that refuses to serve tree-ish not at the tip of any ref. * sg/archive-restrict-remote: add uploadarchive.allowUnreachable option docs: clarify remote restrictions for git-upload-archive | 14 March 2014, 21:27:03 UTC |
| c89eb98 | Junio C Hamano | 14 March 2014, 21:27:00 UTC | Merge branch 'rt/help-pretty-prints-cmd-names' * rt/help-pretty-prints-cmd-names: help.c: rename function "pretty_print_string_list" | 14 March 2014, 21:27:00 UTC |
| d73e616 | Junio C Hamano | 14 March 2014, 21:26:58 UTC | Merge branch 'jl/doc-submodule-update-checkout' Add missing documentation for "submodule update --checkout". * jl/doc-submodule-update-checkout: submodule update: consistently document the '--checkout' option | 14 March 2014, 21:26:58 UTC |
| 2b66d31 | Junio C Hamano | 14 March 2014, 21:26:55 UTC | Merge branch 'jk/doc-coding-guideline' Elaborate on a style niggle that has been part of "mimic existing code". * jk/doc-coding-guideline: CodingGuidelines: mention C whitespace rules | 14 March 2014, 21:26:55 UTC |
| 2669638 | Junio C Hamano | 14 March 2014, 21:26:52 UTC | Merge branch 'da/difftool-git-files' "git difftool" misbehaved when the repository is bound to the working tree with the ".git file" mechanism, where a textual file ".git" tells us where it is. * da/difftool-git-files: t7800: add a difftool test for .git-files difftool: support repositories with .git-files | 14 March 2014, 21:26:52 UTC |
| 13b49f1 | Junio C Hamano | 14 March 2014, 21:26:50 UTC | Merge branch 'tg/index-v4-format' * tg/index-v4-format: read-cache: add index.version config variable test-lib: allow setting the index format version introduce GIT_INDEX_VERSION environment variable | 14 March 2014, 21:26:50 UTC |
| 0963008 | Junio C Hamano | 14 March 2014, 21:26:31 UTC | Merge branch 'nd/i18n-progress' Mark the progress indicators from various time-consuming commands for i18n/l10n. * nd/i18n-progress: i18n: mark all progress lines for translation | 14 March 2014, 21:26:31 UTC |
| 060be00 | Junio C Hamano | 14 March 2014, 21:26:29 UTC | Merge branch 'mh/object-code-cleanup' * mh/object-code-cleanup: sha1_file.c: document a bunch of functions defined in the file sha1_file_name(): declare to return a const string find_pack_entry(): document last_found_pack replace_object: use struct members instead of an array | 14 March 2014, 21:26:29 UTC |
| 85ff22e | Junio C Hamano | 14 March 2014, 21:26:27 UTC | Merge branch 'jn/am-doc-hooks' * jn/am-doc-hooks: am doc: add a pointer to relevant hooks | 14 March 2014, 21:26:27 UTC |
| 430e476 | Junio C Hamano | 14 March 2014, 21:26:22 UTC | Merge branch 'jm/stash-doc-k-for-keep' * jm/stash-doc-k-for-keep: stash doc: mention short form -k in save description | 14 March 2014, 21:26:23 UTC |
| d52571d | Junio C Hamano | 14 March 2014, 21:26:04 UTC | Merge branch 'jk/remote-pushremote-config-reading' "git push" did not pay attention to branch.*.pushremote if it is defined earlier than remote.pushdefault; the order of these two variables in the configuration file should not matter, but it did by mistake. * jk/remote-pushremote-config-reading: remote: handle pushremote config in any order | 14 March 2014, 21:26:05 UTC |
| 3c83b08 | Junio C Hamano | 14 March 2014, 21:25:44 UTC | Merge branch 'jk/commit-dates-parsing-fix' Tighten codepaths that parse timestamps in commit objects. * jk/commit-dates-parsing-fix: show_ident_date: fix tz range check log: do not segfault on gmtime errors log: handle integer overflow in timestamps date: check date overflow against time_t fsck: report integer overflow in author timestamps t4212: test bogus timestamps with git-log | 14 March 2014, 21:25:44 UTC |
| b37f81b | Junio C Hamano | 14 March 2014, 21:25:39 UTC | Merge branch 'jh/note-trees-record-blobs' "git notes -C <blob>" should not take an object that is not a blob. * jh/note-trees-record-blobs: notes: disallow reusing non-blob as a note object | 14 March 2014, 21:25:39 UTC |
| c923f60 | Junio C Hamano | 14 March 2014, 21:25:36 UTC | Merge branch 'rt/links-for-asciidoctor' * rt/links-for-asciidoctor: Documentation: fix documentation AsciiDoc links for external urls | 14 March 2014, 21:25:36 UTC |
| 650c90a | Junio C Hamano | 14 March 2014, 21:25:31 UTC | Merge branch 'nd/no-more-fnmatch' We started using wildmatch() in place of fnmatch(3); complete the process and stop using fnmatch(3). * nd/no-more-fnmatch: actually remove compat fnmatch source code stop using fnmatch (either native or compat) Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch" use wildmatch() directly without fnmatch() wrapper | 14 March 2014, 21:25:31 UTC |
| 3a66e1b | Junio C Hamano | 14 March 2014, 21:25:28 UTC | Merge branch 'ak/gitweb-fit-image' Instead of allowing an <img> to be shown in whatever size, force scaling it to fit on the page with max-height/max-width css style attributes. * ak/gitweb-fit-image: gitweb: Avoid overflowing page body frame with large images | 14 March 2014, 21:25:28 UTC |
| 481e6aa | Junio C Hamano | 14 March 2014, 21:25:20 UTC | Merge branch 'tr/diff-submodule-no-reuse-worktree' "git diff --external-diff" incorrectly fed the submodule directory in the working tree to the external diff driver when it knew it is the same as one of the versions being compared. * tr/diff-submodule-no-reuse-worktree: diff: do not reuse_worktree_file for submodules | 14 March 2014, 21:25:20 UTC |
| 6eb593a | Junio C Hamano | 14 March 2014, 21:25:02 UTC | Merge branch 'nd/reset-setup-worktree' "git reset" needs to refresh the index when working in a working tree (it can also be used to match the index to the HEAD in an otherwise bare repository), but it failed to set up the working tree properly, causing GIT_WORK_TREE to be ignored. * nd/reset-setup-worktree: reset: optionally setup worktree and refresh index on --mixed | 14 March 2014, 21:25:03 UTC |
| ed27751 | Junio C Hamano | 14 March 2014, 21:24:59 UTC | Merge branch 'lb/contrib-contacts-looser-diff-parsing' * lb/contrib-contacts-looser-diff-parsing: git-contacts: do not fail parsing of good diffs | 14 March 2014, 21:24:59 UTC |
| 08f3630 | Junio C Hamano | 14 March 2014, 21:24:40 UTC | Merge branch 'ks/config-file-stdin' "git config" learned to read from the standard input when "-" is given as the value to its "--file" parameter (attempting an operation to update the configuration in the standard input of course is rejected). * ks/config-file-stdin: config: teach "git config --file -" to read from the standard input config: change git_config_with_options() interface builtin/config.c: rename check_blob_write() -> check_write() config: disallow relative include paths from blobs | 14 March 2014, 21:24:40 UTC |
| 7aab05d | Junio C Hamano | 14 March 2014, 21:24:37 UTC | Merge branch 'jk/janitorial-fixes' * jk/janitorial-fixes: open_istream(): do not dereference NULL in the error case builtin/mv: don't use memory after free utf8: use correct type for values in interval table utf8: fix iconv error detection notes-utils: handle boolean notes.rewritemode correctly | 14 March 2014, 21:24:37 UTC |
| b7de45b | Junio C Hamano | 14 March 2014, 21:24:18 UTC | Merge branch 'jk/http-no-curl-easy' Uses of curl's "multi" interface and "easy" interface do not mix well when we attempt to reuse outgoing connections. Teach the RPC over http code, used in the smart HTTP transport, not to use the "easy" interface. * jk/http-no-curl-easy: http: never use curl_easy_perform | 14 March 2014, 21:24:18 UTC |
| baf9e83 | Junio C Hamano | 14 March 2014, 21:24:15 UTC | Merge branch 'ss/completion-rec-sub-fetch-push' * ss/completion-rec-sub-fetch-push: completion: teach --recurse-submodules to fetch, pull and push | 14 March 2014, 21:24:15 UTC |
| dfcd354 | Junio C Hamano | 14 March 2014, 21:23:37 UTC | Merge branch 'nd/gitignore-trailing-whitespace' Trailing whitespaces in .gitignore files, unless they are quoted for fnmatch(3), e.g. "path\ ", are warned and ignored. Strictly speaking, this is a backward incompatible change, but very unlikely to bite any sane user and adjusting should be obvious and easy. * nd/gitignore-trailing-whitespace: t0008: skip trailing space test on Windows dir: ignore trailing spaces in exclude patterns dir: warn about trailing spaces in exclude patterns | 14 March 2014, 21:23:37 UTC |
| 28b6821 | Junio C Hamano | 14 March 2014, 21:05:59 UTC | Merge branch 'jc/check-attr-honor-working-tree' "git check-attr" when (trying to) work on a repository with a working tree did not work well when the working tree was specified via --work-tree (and obviously with --git-dir). The command also works in a bare repository but it reads from the (possibly stale, irrelevant and/or nonexistent) index, which may need to be fixed to read from HEAD, but that is a completely separate issue. As a related tangent to this separate issue, we may want to also fix "check-ignore", which refuses to work in a bare repository, to also operate in a bare one. * jc/check-attr-honor-working-tree: check-attr: move to the top of working tree when in non-bare repository t0003: do not chdir the whole test process | 14 March 2014, 21:06:00 UTC |
| ec44507 | Junio C Hamano | 12 March 2014, 18:04:11 UTC | request-pull: documentation updates The original description talked only about what it does. Instead, start it with the purpose of the command, i.e. what it is used for, and then mention what it does to achieve that goal. Clarify what <start>, <url> and <end> means in the context of the overall purpose of the command. Describe the extended syntax of <end> parameter that is used when the local branch name is different from the branch name at the repository the changes are published. Helped-by: Eric Sunshine Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2014, 21:22:20 UTC |
| 4c30d50 | Jeff King | 12 March 2014, 20:06:17 UTC | rev-list: disable object/refname ambiguity check with --stdin This is the "rev-list" analogue to 25fba78 (cat-file: disable object/refname ambiguity check for batch mode, 2013-07-12). Like cat-file, "rev-list --stdin" may read a large number of sha1 object names, and the warning check introduces a significant slow-down. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2014, 18:56:29 UTC |
| a42fcd1 | Jeff King | 12 March 2014, 20:05:43 UTC | cat-file: restore warn_on_object_refname_ambiguity flag Commit 25fba78 turned off the object/refname ambiguity check during "git cat-file --batch" operations. However, this is a global flag, so let's restore it when we are done. This shouldn't make any practical difference, as cat-file exits immediately afterwards, but is good code hygeine and would prevent an unnecessary surprise if somebody starts to call cmd_cat_file later. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2014, 18:56:17 UTC |
| 2f29e0c | Michael Haggerty | 13 March 2014, 09:19:08 UTC | entry.c: fix possible buffer overflow in remove_subtree() remove_subtree() manipulated path in a fixed-size buffer even though the length of the input, let alone the length of entries within the directory, were not known in advance. Change the function to take a strbuf argument and use that object as its scratch space. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2014, 17:57:48 UTC |
| f63272a | Michael Haggerty | 13 March 2014, 09:19:07 UTC | checkout_entry(): use the strbuf throughout the function There is no need to break out the "buf" and "len" members into separate temporary variables. Rename path_buf to path and use path.buf and path.len directly. This makes it easier to reason about the data flow in the function. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2014, 17:56:50 UTC |
| c049b61 | Nguyễn Thái Ngọc Duy | 13 March 2014, 11:45:31 UTC | connect.c: SP after "}", not TAB Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2014, 17:54:21 UTC |
| 4825b80 | Eric Sunshine | 11 March 2014, 22:46:44 UTC | sh-i18n--envsubst: retire unused string_list_member() This static function has no callers, nor has it had any since its introduction in ba67aaf2d05d (git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext(), 2011-05-14). Remove it. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2014, 22:04:55 UTC |
| c7cb333 | Junio C Hamano | 12 March 2014, 20:43:51 UTC | wt-status: lift the artificual "at least 20 columns" floor When we show unmerged paths, we had an artificial 20 columns floor for the width of labels (e.g. "both deleted:") shown next to the pathnames. Depending on the locale, this may result in a label that is too wide when all the label strings are way shorter than 20 columns, or no-op when a label string is longer than 20 columns. Just drop the artificial floor. The screen real estate is better utilized this way when all the strings are shorter. Adjust the tests to this change. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2014, 21:08:05 UTC |
| 8f17f5b | Jonathan Nieder | 19 December 2013, 19:43:19 UTC | wt-status: i18n of section labels The original code assumes that: (1) the number of bytes written is the width of a string, so they can line up; (2) the "how" string is always <= 19 bytes. Neither of which we should assume. Using the same approach as the earlier 3651e45c (wt-status: take the alignment burden off translators, 2013-11-05), compute the necessary column width to hold the longest label and use that for alignment. cf. http://bugs.debian.org/725777 Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Helped-by: Sandy Carter Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2014, 21:08:05 UTC |
| 335e825 | Jonathan Nieder | 19 December 2013, 19:43:19 UTC | wt-status: extract the code to compute width for labels Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2014, 21:08:05 UTC |
