| 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 |
| 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 |
| 1f2e108 | Jeff King | 10 March 2014, 17:24:47 UTC | clean: simplify dir/not-dir logic When we get a list of paths from read_directory, we further prune it to create the final list of items to remove. The code paths for directories and non-directories repeat the same "add to list" code. This patch restructures the code so that we don't repeat ourselves. Also, by following a "if (condition) continue" pattern like the pathspec check above, it makes it more obvious that the conditional is about excluding directories under certain circumstances. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2014, 19:14:25 UTC |
| cf424f5 | Jeff King | 10 March 2014, 20:37:30 UTC | clean: respect pathspecs with "-d" git-clean uses read_directory to fill in a `struct dir` with potential hits. However, read_directory does not actually check against our pathspec. It uses a simplified version that may turn up false positives. As a result, we need to check that any hits match our pathspec. We do so reliably for non-directories. For directories, if "-d" is not given we check that the pathspec matched exactly (i.e., we are even stricter, and require an explicit "git clean foo" to clean "foo/"). But if "-d" is given, rather than relaxing the exact match to allow a recursive match, we do not check the pathspec at all. This regression was introduced in 113f10f (Make git-clean a builtin, 2007-11-11). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2014, 19:13:42 UTC |
| 35e4d77 | Johannes Sixt | 11 March 2014, 07:46:40 UTC | t0008: skip trailing space test on Windows The Windows API does not preserve file names with trailing spaces (and dots), but rather strips them. Our tools (MSYS bash, git) base the POSIX emulation on the Windows API. As a consequence, it is impossible for bash on Windows to allocate a file whose name has trailing spaces, and for git to stat such a file. Both operate on a file whose name has the spaces stripped. Skip the test that needs such a file name. Note that we do not use (another incarnation of) prerequisite FUNNYNAMES. The reason is that FUNNYNAMES is intended to represent a property of the file system. But the inability to have trailing spaces in a file name is a property of the Windows API. The file system (NTFS) does not have this limitation. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2014, 19:11:49 UTC |
| 384364b | Junio C Hamano | 07 March 2014, 23:12:19 UTC | Start preparing for Git 2.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2014, 23:22:37 UTC |
| e3f1185 | Junio C Hamano | 07 March 2014, 23:18:17 UTC | Merge branch 'cc/starts-n-ends-with-endgame' prefixcmp/suffixcmp are gone. | 07 March 2014, 23:18:28 UTC |
| 2687ffd | Junio C Hamano | 07 March 2014, 23:17:40 UTC | Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion' Remove a confusing and deprecated "-q" option from "git diff-files"; "git diff-files --diff-filter=d" can be used instead. | 07 March 2014, 23:17:41 UTC |
| 289ca27 | Junio C Hamano | 07 March 2014, 23:17:20 UTC | Merge branch 'gj/push-more-verbose-advice' | 07 March 2014, 23:17:20 UTC |
| 2b4a888 | Junio C Hamano | 07 March 2014, 23:16:22 UTC | Merge branch 'jc/core-checkstat-2.0' "core.statinfo" configuration variable, which was a never-advertised synonym to "core.checkstat", has been removed. | 07 March 2014, 23:16:23 UTC |
| 160c4b1 | Junio C Hamano | 07 March 2014, 23:14:47 UTC | Merge branch 'jc/add-2.0-ignore-removal' "git add <pathspec>" is the same as "git add -A <pathspec>" now, i.e. it does not ignore removals from the directory specified. | 07 March 2014, 23:14:47 UTC |
| 053a6b1 | Junio C Hamano | 07 March 2014, 23:14:01 UTC | Merge branch 'jn/add-2.0-u-A-sans-pathspec' "git add -u" and "git add -A" without any pathspec is a tree-wide operation now, even when they are run in a subdirectory of the working tree. | 07 March 2014, 23:14:02 UTC |
| 009055f | Junio C Hamano | 07 March 2014, 23:13:15 UTC | Merge branch 'jc/push-2.0-default-to-simple' Finally update the "git push" default behaviour to "simple". | 07 March 2014, 23:13:15 UTC |
| 3f419d4 | Jeff King | 07 March 2014, 17:15:01 UTC | show_ident_date: fix tz range check Commit 1dca155fe3fa (log: handle integer overflow in timestamps, 2014-02-24) tried to catch integer overflow coming from strtol() on the timezone field by comparing against LONG_MIN/LONG_MAX. However, the intermediate "tz" variable is an "int", which means it can never be LONG_MAX on LP64 systems; we would truncate the output from strtol before the comparison. Clang's -Wtautological-constant-out-of-range-compare notices this and rightly complains. Let's instead store the result of strtol in a long, and then compare it against INT_MIN/INT_MAX. This will catch overflow from strtol, and also overflow when we pass the result as an int to show_date. Reported-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2014, 19:53:29 UTC |
| 50546b1 | Sun He | 03 March 2014, 09:39:59 UTC | Use hashcpy() when copying object names We invented hashcpy() to keep the abstraction of "object name" behind it. Use it instead of calling memcpy() with hard-coded 20-byte length when moving object names between pieces of memory. Leave ppc/sha1.c as-is, because the function is about the SHA-1 hash algorithm whose output is and will always be 20 bytes. Helped-by: Michael Haggerty <mhagger@alum.mit.edu> Helped-by: Duy Nguyen <pclouds@gmail.com> Signed-off-by: Sun He <sunheehnus@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2014, 22:03:12 UTC |
| 6ab4ae2 | Junio C Hamano | 05 March 2014, 23:06:59 UTC | Merge branch 'maint' * maint: i18n: proposed command missing leading dash | 05 March 2014, 23:06:59 UTC |
| ee3a81e | Junio C Hamano | 05 March 2014, 23:06:42 UTC | Merge branch 'jk/run-network-tests-by-default' Teach "make test" to run networking tests when possible by default. * jk/run-network-tests-by-default: tests: turn on network daemon tests by default | 05 March 2014, 23:06:45 UTC |
| 4c4ac4d | Junio C Hamano | 05 March 2014, 23:06:38 UTC | Merge branch 'nd/daemonize-gc' Allow running "gc --auto" in the background. * nd/daemonize-gc: gc: config option for running --auto in background daemon: move daemonize() to libgit.a | 05 March 2014, 23:06:39 UTC |
| 6376463 | Junio C Hamano | 05 March 2014, 23:06:26 UTC | Merge branch 'ks/combine-diff' Teach combine-diff to honour the path-output-order imposed by diffcore-order, and optimize how matching paths are found in the N-way diffs made with parents. * ks/combine-diff: tests: add checking that combine-diff emits only correct paths combine-diff: simplify intersect_paths() further combine-diff: combine_diff_path.len is not needed anymore combine-diff: optimize combine_diff_path sets intersection diff test: add tests for combine-diff with orderfile diffcore-order: export generic ordering interface | 05 March 2014, 23:06:26 UTC |
| ba928c1 | Jeff King | 05 March 2014, 19:04:54 UTC | push: detect local refspec errors early When pushing, we do not even look at our push refspecs until after we have made contact with the remote receive-pack and gotten its list of refs. This means that we may go to some work, including asking the user to log in, before realizing we have simple errors like "git push origin matser". We cannot catch all refspec problems, since fully evaluating the refspecs requires knowing what the remote side has. But we can do a quick sanity check of the local side and catch a few simple error cases. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 21:23:27 UTC |
| 471fd3f | Jeff King | 05 March 2014, 19:03:43 UTC | match_explicit_lhs: allow a "verify only" mode The match_explicit_lhs function has all of the logic necessary to verify the refspecs without actually doing any work. This patch lets callers pass a NULL "match" pointer to indicate they want a "verify only" operation. For the most part, we just need to avoid writing to the NULL pointer. However, we also have to refactor the try_explicit_object_name sub-function; it indicates success by allocating and returning a new ref. Instead, we give it an "out" parameter for the match and return a numeric status. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 21:23:26 UTC |
| f7ade3d | Jeff King | 05 March 2014, 19:03:21 UTC | match_explicit: hoist refspec lhs checks into their own function In preparation for being able to check the left-hand side of our push refspecs separately, this pulls the examination of them out into its own function. There should be no behavior change. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 21:23:26 UTC |
| 3491047 | Michael Haggerty | 05 March 2014, 17:26:30 UTC | cache_tree_find(): use path variable when passing over slashes The search for the end of the slashes is part of the update of the path variable for the next iteration as opposed to an update of the slash variable. So iterate using path rather than slash. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 20:34:26 UTC |
| 8b7e5f7 | Michael Haggerty | 05 March 2014, 17:26:29 UTC | cache_tree_find(): remove early return There is no need for an early return it; from the loop if slash points at the end of the string, because that is exactly what will happen when the while condition fails at the start of the next iteration. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 20:34:05 UTC |
| 03b0403 | Michael Haggerty | 05 March 2014, 17:26:28 UTC | cache_tree_find(): remove redundant check If *slash == '/', then it is necessarily non-NUL. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 20:33:53 UTC |
| 79192b8 | Michael Haggerty | 05 March 2014, 17:26:27 UTC | cache_tree_find(): fix comment formatting Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 20:33:46 UTC |
| 17e22dd | Michael Haggerty | 05 March 2014, 17:26:26 UTC | cache_tree_find(): find the end of path component using strchrnul() Suggested-by: Junio Hamano <gitster@pobox.com> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 20:33:30 UTC |
| 72c378d | Michael Haggerty | 05 March 2014, 17:26:25 UTC | cache_tree_find(): remove redundant checks slash is initialized to a value that cannot be NULL. So remove the guards against slash == NULL later in the loop. Suggested-by: David Kastrup <dak@gnu.org> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 20:33:02 UTC |
| 9ef5e2a | Jacopo Notarstefano | 28 February 2014, 11:09:04 UTC | branch.c: delete size check of newly tracked branch names Since commit 6f084a56 the length of a newly tracked branch name was limited to 1019 = 1024 - 7 - 7 - 1 characters, a bound derived by having to store this name in a char[1024] called key with two strings of length at most 7 and a '\0' character. This was no longer necessary as of commit a9f2c136, which uses a strbuf (documented in Documentation/technical/api-strbuf.txt) to store this value. Remove this unneeded check to allow branch names longer than 1019 characters. Signed-off-by: Jacopo Notarstefano <jacopo.notarstefano@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 20:26:51 UTC |
| e650d06 | Jeff King | 05 March 2014, 19:28:38 UTC | docs: mark info/grafts as outdated We should be encouraging people to use git-replace instead. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 20:24:01 UTC |
| fcfec8b | Junio C Hamano | 05 March 2014, 09:23:35 UTC | t7800: add a difftool test for .git-files Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 20:20:23 UTC |
| 16216b6 | Sandy Carter | 03 March 2014, 14:55:53 UTC | i18n: proposed command missing leading dash Add missing leading dash to proposed commands in french output when using the command: git branch --set-upstream remotename/branchname and when upstream is gone Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 14:10:24 UTC |
| 147972b | Tanay Abhra | 04 March 2014, 21:06:30 UTC | commit.c: use skip_prefix() instead of starts_with() In record_author_date() & parse_gpg_output(), the callers of starts_with() not just want to know if the string starts with the prefix, but also can benefit from knowing the string that follows the prefix. By using skip_prefix(), we can do both at the same time. Helped-by: Max Horn <max@quendi.de> Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Tanay Abhra <tanayabh@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2014, 21:26:42 UTC |
| 305a233 | Jacopo Notarstefano | 04 March 2014, 00:21:43 UTC | git-bisect.sh: fix a few style issues Redirection operators should have a space before them, but not after them. Signed-off-by: Jacopo Notarstefano <jacopo.notarstefano@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2014, 02:29:34 UTC |
| c735396 | Dmitry S. Dolzhenko | 03 March 2014, 22:32:02 UTC | sha1_file.c: use ALLOC_GROW() in pretend_sha1_file() Helped-by: He Sun <sunheehnus@gmail.com> Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:54:58 UTC |
| 999f566 | Dmitry S. Dolzhenko | 03 March 2014, 22:32:01 UTC | read-cache.c: use ALLOC_GROW() in add_index_entry() Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:54:54 UTC |
| 66d9f38 | Dmitry S. Dolzhenko | 03 March 2014, 22:32:00 UTC | builtin/mktree.c: use ALLOC_GROW() in append_to_tree() Helped-by: He Sun <sunheehnus@gmail.com> Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:54:45 UTC |
| 3a7fa03 | Dmitry S. Dolzhenko | 03 March 2014, 22:31:59 UTC | attr.c: use ALLOC_GROW() in handle_attr_line() Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:54:37 UTC |
| 9af49f8 | Dmitry S. Dolzhenko | 03 March 2014, 22:31:58 UTC | dir.c: use ALLOC_GROW() in create_simplify() Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:54:29 UTC |
| 6647cc2 | Dmitry S. Dolzhenko | 03 March 2014, 22:31:57 UTC | reflog-walk.c: use ALLOC_GROW() Use ALLOC_GROW() instead of open-coding it in add_commit_info() and read_one_reflog(). Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:53:57 UTC |
| 72004b4 | Dmitry S. Dolzhenko | 03 March 2014, 22:31:56 UTC | replace_object.c: use ALLOC_GROW() in register_replace_object() Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:49:17 UTC |
| 104fb26 | Dmitry S. Dolzhenko | 03 March 2014, 22:31:55 UTC | patch-ids.c: use ALLOC_GROW() in add_commit() Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:49:12 UTC |
| 337ce24 | Dmitry S. Dolzhenko | 03 March 2014, 22:31:54 UTC | diffcore-rename.c: use ALLOC_GROW() Use ALLOC_GROW() instead of open-coding it in locate_rename_dst() and register_rename_src(). Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:49:02 UTC |
| 4c960a4 | Dmitry S. Dolzhenko | 03 March 2014, 22:31:53 UTC | diff.c: use ALLOC_GROW() Use ALLOC_GROW() instead of open-coding it in diffstat_add() and diff_q(). Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:48:39 UTC |
| d6e82b5 | Dmitry S. Dolzhenko | 03 March 2014, 22:31:52 UTC | commit.c: use ALLOC_GROW() in register_commit_graft() Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:47:07 UTC |
| bcc7a03 | Dmitry S. Dolzhenko | 03 March 2014, 22:31:51 UTC | cache-tree.c: use ALLOC_GROW() in find_subtree() Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:45:35 UTC |
| 5cbbe13 | Dmitry S. Dolzhenko | 03 March 2014, 22:31:50 UTC | bundle.c: use ALLOC_GROW() in add_to_ref_list() Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:44:48 UTC |
| 25e1940 | Dmitry S. Dolzhenko | 03 March 2014, 22:31:49 UTC | builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path() Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:44:11 UTC |
| b294097 | Simon Ruderich | 03 March 2014, 21:16:12 UTC | git-add--interactive: warn if module for interactive.singlekey is missing Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Simon Ruderich <simon@ruderich.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:11:18 UTC |
| 8358f1a | Simon Ruderich | 03 March 2014, 21:15:50 UTC | git-config: document interactive.singlekey requires Term::ReadKey Most distributions don't require Term::ReadKey as dependency, leaving the user to wonder why the setting doesn't work. Signed-off-by: Simon Ruderich <simon@ruderich.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 22:10:55 UTC |
| 187e290 | Nguyễn Thái Ngọc Duy | 01 March 2014, 02:50:55 UTC | strbuf: style fix -- top opening bracket on a separate line Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 20:26:08 UTC |
| ee34a2b | Jeff King | 03 March 2014, 20:04:20 UTC | repack: add `repack.packKeptObjects` config var The git-repack command always passes `--honor-pack-keep` to pack-objects. This has traditionally been a good thing, as we do not want to duplicate those objects in a new pack, and we are not going to delete the old pack. However, when bitmaps are in use, it is important for a full repack to include all reachable objects, even if they may be duplicated in a .keep pack. Otherwise, we cannot generate the bitmaps, as the on-disk format requires the set of objects in the pack to be fully closed. Even if the repository does not generally have .keep files, a simultaneous push could cause a race condition in which a .keep file exists at the moment of a repack. The repack may try to include those objects in one of two situations: 1. The pushed .keep pack contains objects that were already in the repository (e.g., blobs due to a revert of an old commit). 2. Receive-pack updates the refs, making the objects reachable, but before it removes the .keep file, the repack runs. In either case, we may prefer to duplicate some objects in the new, full pack, and let the next repack (after the .keep file is cleaned up) take care of removing them. This patch introduces both a command-line and config option to disable the `--honor-pack-keep` option. By default, it is triggered when pack.writeBitmaps (or `--write-bitmap-index` is turned on), but specifying it explicitly can override the behavior (e.g., in cases where you prefer .keep files to bitmaps, but only when they are present). Note that this option just disables the pack-objects behavior. We still leave packs with a .keep in place, as we do not necessarily know that we have duplicated all of their objects. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 20:21:49 UTC |
| 5889271 | Sun He | 03 March 2014, 09:24:29 UTC | finish_tmp_packfile():use strbuf for pathname construction The old version fixes a maximum length on the buffer, which could be a problem if one is not certain of the length of get_object_directory(). Using strbuf can avoid the protential bug. Helped-by: Michael Haggerty <mhagger@alum.mit.edu> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Sun He <sunheehnus@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 20:15:10 UTC |
| 2156a98 | Junio C Hamano | 03 March 2014, 20:13:20 UTC | Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile * sh/write-pack-file-warning-message-fix: write_pack_file: use correct variable in diagnostic | 03 March 2014, 20:13:20 UTC |
| 0eea5a6 | Sun He | 02 March 2014, 07:30:11 UTC | write_pack_file: use correct variable in diagnostic 'pack_tmp_name' is the subject of the utime() check, so report it in the warning, not the uninitialized 'tmpname' Signed-off-by: Sun He <sunheehnus@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2014, 18:43:40 UTC |
| 893a976 | Jens Lehmann | 28 February 2014, 22:41:11 UTC | submodule update: consistently document the '--checkout' option Commit 322bb6e12f (add update 'none' flag to disable update of submodule by default) added the '--checkout' option to "git submodule update" but forgot to explicitly document it in synopsis, usage string and man page (It is only mentioned implicitly in the man page). In 23d25e48 (submodule: explicit local branch creation in module_clone) the synopsis of the man page was updated, but the "OPTIONS" section of the man page and the usage string of the git-submodule script still do not mention the '--checkout' option. Fix that by documenting this option in usage string and the "OPTIONS" section of man page too. While at it group the update-mode options into a single set in the usage string. Reported-by: Matthijs Kooijman <matthijs@stdin.nl> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2014, 23:34:36 UTC |
| d10cb3d | Ralf Thielow | 28 February 2014, 19:27:29 UTC | help.c: rename function "pretty_print_string_list" The part "string_list" of the name of function "pretty_print_string_list" is just an implementation detail. The function pretty-prints command names so rename it to "pretty_print_cmdnames". Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2014, 21:24:53 UTC |
