- 09 4月, 2014 1 次提交
-
-
由 Junio C Hamano 提交于
Finishing touches for portability. * jk/commit-dates-parsing-fix: t4212: loosen far-in-future test for AIX date: recognize bogus FreeBSD gmtime output
-
- 08 4月, 2014 1 次提交
-
-
由 Vlad Dogaru 提交于
'git p4 rebase' fails with the following message if there is a file named HEAD in the current directory: fatal: ambiguous argument 'HEAD': both revision and filename Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' Take the suggestion above and explicitly state that HEAD should be treated as a revision. Signed-off-by: NVlad Dogaru <vdogaru@ixiacom.com> Acked-by: NPete Wyckoff <pw@padd.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 05 4月, 2014 1 次提交
-
-
由 Marat Radchenko 提交于
Drop NO_PERL_MAKEMAKER from config.mak.uname for the MSVC platform. MakeMaker is available on Windows Perl implementations and installs modules to correct location, unlike NO_PERL_MAKEMAKER Makefile. Signed-off-by: NMarat Radchenko <marat@slonopotamus.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 04 4月, 2014 18 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: Start preparing for 1.9.1
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jk/mv-submodules-fix: mv: prevent mismatched data when ignoring errors. builtin/mv: fix out of bounds write Conflicts: t/t7001-mv.sh
-
由 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
-
由 Junio C Hamano 提交于
* jk/lib-terminal-lazy: t/lib-terminal: make TTY a lazy prerequisite
-
由 Junio C Hamano 提交于
* nd/index-pack-error-message: index-pack: report error using the correct variable
-
由 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 提交于
* 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
-
由 Junio C Hamano 提交于
* jc/stash-pop-not-popped: stash pop: mention we did not drop the stash upon failing to apply
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
Allow tweaking the maximum length of the delta-chain produced by "gc --aggressive". * nd/gc-aggressive: environment.c: fix constness for odb_pack_keep() gc --aggressive: make --depth configurable
-
由 Junio C Hamano 提交于
"diff --no-index -Mq a b" fell into an infinite loop. * jc/fix-diff-no-index-diff-opt-parse: diff-no-index: correctly diagnose error return from diff_opt_parse()
-
由 Junio C Hamano 提交于
* cb/aix: tests: don't rely on strerror text when testing rmdir failure dir.c: make git_fnmatch() not inline
-
由 Junio C Hamano 提交于
Protect refs in a hierarchy that can come from more than one remote hierarcies from incorrect removal by "git fetch --prune". * cn/fetch-prune-overlapping-destination: fetch: handle overlaping refspecs on --prune fetch: add a failing test for prunning with overlapping refspecs
-
由 Junio C Hamano 提交于
Attempts to show where a single-strand-of-pearls break in "git log" output. * nd/log-show-linear-break: log: add --show-linear-break to help see non-linear history object.h: centralize object flag allocation
-
由 Junio C Hamano 提交于
* ep/shell-command-substitution: git-am.sh: use the $(...) construct for command substitution check-builtins.sh: use the $(...) construct for command substitution
-
- 03 4月, 2014 4 次提交
-
-
由 Junio C Hamano 提交于
* ap/remote-hg-skip-null-bookmarks: remote-hg: do not fail on invalid bookmarks
-
由 Junio C Hamano 提交于
Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S to be used together and work as expected to perform a pickaxe search using case-insensitive regular expression matching. * rs/pickaxe-i: pickaxe: simplify kwset loop in contains() pickaxe: call strlen only when necessary in diffcore_pickaxe_count() pickaxe: move pickaxe() after pickaxe_match() pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe() pickaxe: honor -i when used with -S and --pickaxe-regex t4209: use helper functions to test --author t4209: use helper functions to test --grep t4209: factor out helper function test_log_icase() t4209: factor out helper function test_log() t4209: set up expectations up front
-
由 Junio C Hamano 提交于
As we are not shipping with the submodule change, remove the entry for it.
-
由 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 3 次提交
-
-
由 Jeff King 提交于
One of the tests in t4212 checks our behavior when we feed gmtime a date so far in the future that it gives up and returns NULL. Some implementations, like AIX, may actually just provide us a bogus result instead. It's not worth it for us to come up with heuristics that guess whether the return value is sensible or not. On good platforms where gmtime reports the problem to us with NULL, we will print the epoch value. On bad platforms, we will print garbage. But our test should be written for the lowest common denominator so that it passes everywhere. Reported-by: NCharles Bailey <cbailey32@bloomberg.net> Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
Most gmtime implementations return a NULL value when they encounter an error (and this behavior is specified by ANSI C and POSIX). FreeBSD's implementation, however, will simply leave the "struct tm" untouched. Let's also recognize this and convert it to a NULL (with this patch, t4212 should pass on FreeBSD). Reported-by: NRené Scharfe <l.s.r@web.de> Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
This reverts commit 00d4ff1a, reversing changes made to d3badc6e.
-
- 01 4月, 2014 12 次提交
-
-
由 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
-