- 03 4月, 2014 1 次提交
-
-
由 Junio C Hamano 提交于
This reverts commit 23d25e48, as it is broken for users who haven't opted into the new feature of checking out submodule.*.branch with update mode set to checkout.
-
- 02 4月, 2014 1 次提交
-
-
由 Junio C Hamano 提交于
This reverts commit 00d4ff1a, reversing changes made to d3badc6e.
-
- 01 4月, 2014 14 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* mm/status-porcelain-format-i18n-fix: status: disable translation when --porcelain is used
-
由 Junio C Hamano 提交于
* an/branch-config-message: branch.c: install_branch_config: simplify if chain
-
由 Junio C Hamano 提交于
* jk/tests-cleanup: t0001: drop subshells just for "cd" t0001: drop useless subshells t0001: use test_must_fail t0001: use test_config_global t0001: use test_path_is_* t0001: make symlink reinit test more careful t: prefer "git config --file" to GIT_CONFIG t: prefer "git config --file" to GIT_CONFIG with test_must_fail t: stop using GIT_CONFIG to cross repo boundaries t: drop useless sane_unset GIT_* calls t/test-lib: drop redundant unset of GIT_CONFIG t/Makefile: stop setting GIT_CONFIG
-
由 Junio C Hamano 提交于
* wt/doc-submodule-name-path-confusion-2: doc: submodule.*.branch config is keyed by name
-
由 Junio C Hamano 提交于
* wt/doc-submodule-name-path-confusion-1: doc: submodule.* config are keyed by submodule names
-
由 Junio C Hamano 提交于
* mr/msvc-link-with-lcurl: MSVC: allow linking with the cURL library
-
由 Junio C Hamano 提交于
Teaches the "rev-parse --parseopt" mechanism used by scripted Porcelains to parse command line options and give help text how to supply argv-help (the placeholder string for an option parameter, e.g. "key-id" in "--gpg-sign=<key-id>"). * ib/rev-parse-parseopt-argh: t1502: protect runs of SPs used in the indentation rev-parse --parseopt: option argument name hints
-
由 Junio C Hamano 提交于
* dp/makefile-charset-lib-doc: Makefile: describe CHARSET_LIB better
-
由 Junio C Hamano 提交于
Improves the pattern to match the hunk-header for C/C++. * js/userdiff-cc: userdiff: have 'cpp' hunk header pattern catch more C++ anchor points t4018: test cases showing that the cpp pattern misses many anchor points t4018: test cases for the built-in cpp pattern t4018: reduce test files for pattern compilation tests t4018: convert custom pattern test to the new infrastructure t4018: convert java pattern test to the new infrastructure t4018: convert perl pattern tests to the new infrastructure t4018: an infrastructure to test hunk headers userdiff: support unsigned and long long suffixes of integer constants userdiff: support C++ ->* and .* operators in the word regexp
-
由 Junio C Hamano 提交于
* dw/doc-status-no-longer-shows-pound-prefix: doc: status, remove leftover statement about '#' prefix
-
由 Junio C Hamano 提交于
* ca/doc-config-third-party: config.txt: third-party tools may and do use their own variables
-
由 Junio C Hamano 提交于
* hs/simplify-bit-setting-in-fsck-tree: fsck: use bitwise-or assignment operator to set flag
-
由 Junio C Hamano 提交于
* dt/tests-with-env-not-subshell: tests: use "env" to run commands with temporary env-var settings
-
- 29 3月, 2014 9 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* ys/fsck-commit-parsing: fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant fsck.c:fsck_ident(): ident points at a const string
-
由 Junio C Hamano 提交于
* bg/rebase-off-of-previous-branch: rebase: allow "-" short-hand for the previous branch
-
由 Junio C Hamano 提交于
When it is not necessary to edit a commit log message (e.g. "git commit -m" is given a message without specifying "-e"), we used to disable the spawning of the editor by overriding GIT_EDITOR, but this means all the uses of the editor, other than to edit the commit log message, are also affected. * bp/commit-p-editor: run-command: mark run_hook_with_custom_index as deprecated merge hook tests: fix and update tests merge: fix GIT_EDITOR override for commit hook commit: fix patch hunk editing with "commit -p -m" test patch hunk editing with "commit -p -m" merge hook tests: use 'test_must_fail' instead of '!' merge hook tests: fix missing '&&' in test
-
由 Junio C Hamano 提交于
* ah/doc-gitk-config: Documentation/gitk: document the location of the configulation file
-
由 Junio C Hamano 提交于
* fr/add-interactive-argv-array: add: use struct argv_array in run_add_interactive()
-
由 Junio C Hamano 提交于
A stray environment variable $prefix could have leaked into and affected the behaviour of the "subtree" script. * jk/subtree-prefix: subtree: initialize "prefix" variable
-
由 Junio C Hamano 提交于
The progress output while repacking and transferring objects showed an apparent large silence while writing the objects out of existing packfiles, when the reachability bitmap was in use. * jk/pack-bitmap-progress: pack-objects: show reused packfile objects in "Counting objects" pack-objects: show progress for reused packfiles
-
由 Junio C Hamano 提交于
Instead of dying when asked to (re)pack with the reachability bitmap when a bitmap cannot be built, just (re)pack without producing a bitmap in such a case, with a warning. * jk/pack-bitmap: pack-objects: turn off bitmaps when skipping objects
-
- 28 3月, 2014 3 次提交
-
-
由 W. Trevor King 提交于
Ever since 941987a5 (git-submodule: give submodules proper names, 2007-06-11) introduced the ability to move a submodule from one path to another inside its superproject tree without losing its identity, we should have consistently used submodule.<name>.* to access settings related to the named submodule. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
Ever since 941987a5 (git-submodule: give submodules proper names, 2007-06-11) introduced the ability to move a submodule from one path to another inside its superproject tree without losing its identity, we should have consistently used submodule.<name>.* to access settings related to the named submodule. Reported-by: NJunio C Hamano <gitster@pobox.com> Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Marat Radchenko 提交于
Teach the clink.pl script that -lcurl is a request to link with the cURL library, and drop NO_CURL from config.mak.uname for the MSVC platform. Signed-off-by: NMarat Radchenko <marat@slonopotamus.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 27 3月, 2014 1 次提交
-
-
由 Matthieu Moy 提交于
"git status --branch --porcelain" displays the status of the branch (ahead, behind, gone), and used gettext to translate the string. Use hardcoded strings when --porcelain is used, but keep the gettext translation for "git status --short" which is essentially the same, but meant to be read by a human. Reported-by: NAnarky <ghostanarky@gmail.com> Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 26 3月, 2014 11 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* ss/test-on-mingw-rsync-path-no-absolute: t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync
-
由 Junio C Hamano 提交于
* bb/diff-no-index-dotdot: diff-no-index: replace manual "."/".." check with is_dot_or_dotdot() diff-no-index: rename read_directory()
-
由 Junio C Hamano 提交于
* us/printf-not-echo: test-lib.sh: do not "echo" caller-supplied strings rebase -i: do not "echo" random user-supplied strings
-
由 Junio C Hamano 提交于
* rr/doc-merge-strategies: Documentation/merge-strategies: avoid hyphenated commands
-
由 Junio C Hamano 提交于
* nd/index-pack-error-message: index-pack: report error using the correct variable
-
由 Junio C Hamano 提交于
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
-
由 Junio C Hamano 提交于
* dm/configure-iconv-locale-charset: configure.ac: link with -liconv for locale_charset()
-
由 Junio C Hamano 提交于
"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
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
* mh/remove-subtree-long-pathname-fix: entry.c: fix possible buffer overflow in remove_subtree() checkout_entry(): use the strbuf throughout the function
-