1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Junio C Hamano
Git 1.7.4-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.4-rc1
Junio C Hamano
Merge branch 'maint' to sync with 1.7.3.5
Junio C Hamano
Git 1.7.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.3.5
Junio C Hamano
Merge branch 'jn/svn-fe' (early part) * 'jn/svn-fe' (early part): vcs-svn: Error out for v3 dumps Conflicts: t/t9010-svn-fe.sh
Junio C Hamano
Merge branch 'ao/t9001-fix' * ao/t9001-fix: t/t9001-send-email.sh: fix '&&' chain in some tests
Junio C Hamano
Merge branch 'pw/convert-pathname-substitution' * pw/convert-pathname-substitution: t0021: avoid getting filter killed with SIGPIPE convert filter: supply path to external driver
Junio C Hamano
Merge branch 'mg/cvsimport' * mg/cvsimport: cvsimport: handle the parsing of uppercase config options cvsimport: partial whitespace cleanup
Antonio Ospite
t/t9001-send-email.sh: fix '&&' chain in some tests t/README recommends chaining test assertions. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
cvsimport: handle the parsing of uppercase config options The current code leads to fatal: bad config value for 'cvsimport.r' in .git/config for a standard use case with cvsimport.r set. cvsimport sets internal variables by checking the config for each possible command line option. The problem is that config items are case insensitive, so config.r and config.R are the same. The ugly error is due to that fact that cvsimport expects a bool for -R (and…
Junio C Hamano
Merge branch 'maint' * maint: gitweb: skip logo in atom feed when there is none t9001: Fix test prerequisites
Jonathan Nieder
daemon: support <directory> arguments again Ever since v1.7.4-rc0~125^2~8 (daemon: use run-command api for async serving, 2010-11-04), git daemon spawns child processes instead of forking to serve requests. The child processes learn that they are being run for this purpose from the presence of the --serve command line flag. When running with <ok_path> arguments, the --serve flag is treated as one of the path arguments and the special chil…
Ralf Wildenhues
Fix typos in the documentation Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder
gitweb: skip logo in atom feed when there is none With v1.5.0-rc0~169 (gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url, 2006-12-04), the logo URI to be written to Atom feeds was corrected but the case of no logo forgotten. Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
robbat2
t9001: Fix test prerequisites Add in missing Perl prerequisites for new tests of send-email. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.4-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.4-rc0
Junio C Hamano
Merge branch 'maint' * maint: Prepare for 1.7.3.5 Fix false positives in t3404 due to SHELL=/bin/false close file on error in read_mmfile() Conflicts: RelNotes
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…
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
  1. Prev
  2. Next