Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Prepare for 1.7.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/commit-die-on-bogus-ident' into maint * jk/commit-die-on-bogus-ident: commit: die before asking to edit the log message ident: die on bogus date format
Junio C Hamano
Merge branch 'ks/blame-worktree-textconv-cached' into maint * ks/blame-worktree-textconv-cached: fill_textconv(): Don't get/put cache if sha1 is not valid t/t8006: Demonstrate blame is broken when cachetextconv is on
Junio C Hamano
Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint * jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch
Junio C Hamano
Merge branch 'jc/maint-am-abort-safely' into maint * jc/maint-am-abort-safely: am --abort: keep unrelated commits since the last failure and warn
Junio C Hamano
Merge branch 'kb/maint-status-cquote' into maint * kb/maint-status-cquote: status: Quote paths with spaces in short format
Brandon Casey
t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' The '--no-chain-reply-to' option is a Getopt::Long boolean option. The '--no-' prefix (as in --no-chain-reply-to) for boolean options is not supported in Getopt::Long version 2.32 which was released with Perl 5.8.0. This version only supports '--no' as in '--nochain-reply-to'. More recent versions of Getopt::Long, such as version 2.34, support either prefix. So use the older form in the tests. S…
Junio C Hamano
Merge branch 'jc/maint-rebase-rewrite-last-skip' * jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch
Junio C Hamano
Merge branch 'nd/setup' * nd/setup: (47 commits) setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd git.txt: correct where --work-tree path is relative to Revert "Documentation: always respect core.worktree if set" t0001: test git init when run via an alias Remove all logic from get_git_work_tree() setup: rework setup_explicit_git_dir() setup: clean up setup_discovered_git_dir() t1020-subdir…
robbat2
Fix false positives in t3404 due to SHELL=/bin/false If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's package building), the git-rebase exec tests will fail, because they call $SHELL around the command, and in the existing testcase, $SHELL was not being cleared sufficently. This lead to false positive failures of t3404 on systems where the package build user was locked down as noted above. Signed-off-by: "Robin H. Johns…
Junio C Hamano
userdiff/perl: catch BEGIN/END/... and POD as headers Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder
diff: funcname and word patterns for perl The default function name discovery already works quite well for Perl code... with the exception of here-documents (or rather their ending). sub foo { print <<END here-document END return 1; } The default funcname pattern treats the unindented END line as a function declaration and puts it in the @@ line of diff and "grep --show-function" output. With a little knowledge of perl syntax, we…
Nguyễn Thái Ngọc Duy
setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd When setup_work_tree() is called, it moves cwd to $GIT_WORK_TREE and makes internal copy of $GIT_WORK_TREE absolute. The environt variable, if set by user, remains unchanged. If the variable is relative, it is no longer correct because its base dir has changed. Instead of making $GIT_WORK_TREE absolute too, we just say "." and let subsequent git processes handle it. Reported-by: Michel Briand <m…
Junio C Hamano
Merge branch 'rs/maint-diff-fd-leak' into maint * rs/maint-diff-fd-leak: close file on error in read_mmfile()
René Scharfe
close file on error in read_mmfile() Reported in http://qa.debian.org/daca/cppcheck/sid/git_1.7.2.3-2.2.html and in http://thread.gmane.org/gmane.comp.version-control.git/123042. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'rj/maint-difftool-cygwin-workaround' * rj/maint-difftool-cygwin-workaround: difftool: Fix failure on Cygwin
Junio C Hamano
Merge branch 'maint' * maint: test-lib.sh/test_decode_color(): use octal not hex in awk script
Brandon Casey
Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections IRIX's fnmatch() does not support the GNU FNM_CASEFOLD extension, so set NO_FNMATCH_CASEFOLD so that the internal fnmatch implementation will be used. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey
test-lib.sh/test_decode_color(): use octal not hex in awk script POSIX awk seems to explicitly not support hexadecimal escape sequences. From http://pubs.opengroup.org/onlinepubs/009695399/: Regular expressions in awk have been extended somewhat... One sequence that is not supported is hexadecimal value escapes beginning with '\x'. This affects the awk on IRIX 6.5, and causes t4015.56 to fail. Use octal instead. Signed-off-by: Brandon Casey <casey@…
Junio C Hamano
rebase --skip: correctly wrap-up when skipping the last patch When "rebase --skip" is used to skip the last patch in the series, the code to wrap up the rewrite by copying the notes from old to new commits and also by running the post-rewrite hook was bypassed. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
t0021: avoid getting filter killed with SIGPIPE The fake filter did not read from the standard input at all, which caused the calling side to die with SIGPIPE, depending on the timing. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'rj/maint-test-fixes' * rj/maint-test-fixes: t9501-*.sh: Fix a test failure on Cygwin lib-git-svn.sh: Add check for mis-configured web server variables lib-git-svn.sh: Avoid setting web server variables unnecessarily t9142: Move call to start_httpd into the setup test t3600-rm.sh: Don't pass a non-existent prereq to test #15
Junio C Hamano
Merge branch 'jc/maint-am-abort-safely' * jc/maint-am-abort-safely: am --abort: keep unrelated commits since the last failure and warn
Junio C Hamano
Merge branch 'jk/commit-die-on-bogus-ident' * jk/commit-die-on-bogus-ident: commit: die before asking to edit the log message ident: die on bogus date format Conflicts: builtin/commit.c
Junio C Hamano
Merge branch 'pd/bash-4-completion' * pd/bash-4-completion: bash: simple reimplementation of _get_comp_words_by_ref bash: get --pretty=m<tab> completion to work with bash v4 Conflicts: contrib/completion/git-completion.bash
Junio C Hamano
Merge branch 'nd/maint-fix-add-typo-detection' * nd/maint-fix-add-typo-detection: Revert "excluded_1(): support exclude files in index" unpack-trees: fix sparse checkout's "unable to match directories" unpack-trees: move all skip-worktree checks back to unpack_trees() dir.c: add free_excludes() cache.h: realign and use (1 << x) form for CE_* constants
Junio C Hamano
Merge branch 'tf/commit-list-prefix' * tf/commit-list-prefix: commit: Add commit_list prefix in two function names. Conflicts: sha1_name.c
Nguyễn Thái Ngọc Duy
git.txt: correct where --work-tree path is relative to Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy
Revert "Documentation: always respect core.worktree if set" This reverts commit f5e025a9d5b35e24768475f6890b836ce0d5ed15. The commit reflected what the code did. But the code did that because it had bugs. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder
t0001: test git init when run via an alias Add some tests to document the correct behavior of (possibly aliased) init when run within and outside a git directory. If I set up a simple git alias “quietinit = init --quiet”, usually it will work just like ‘git init --quiet’. There are some differences, unfortunately, since in the process of checking for aliases, git has to look for a .git/config file. If ‘git quietinit’ is run from a subdi…
  1. Prev
  2. Next