Permalink
Commits on Jan 5, 2011
  1. Git 1.7.4-rc1

    gitster committed Jan 5, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Git 1.7.3.5

    gitster committed Jan 5, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'jn/svn-fe' (early part)

    gitster committed Jan 5, 2011
    * 'jn/svn-fe' (early part):
      vcs-svn: Error out for v3 dumps
    
    Conflicts:
    	t/t9010-svn-fe.sh
  4. Merge branch 'ao/t9001-fix'

    gitster committed Jan 5, 2011
    * ao/t9001-fix:
      t/t9001-send-email.sh: fix '&&' chain in some tests
  5. Merge branch 'pw/convert-pathname-substitution'

    gitster committed Jan 5, 2011
    * pw/convert-pathname-substitution:
      t0021: avoid getting filter killed with SIGPIPE
      convert filter: supply path to external driver
  6. Merge branch 'mg/cvsimport'

    gitster committed Jan 5, 2011
    * mg/cvsimport:
      cvsimport: handle the parsing of uppercase config options
      cvsimport: partial whitespace cleanup
Commits on Jan 4, 2011
  1. t/t9001-send-email.sh: fix '&&' chain in some tests

    ao2 authored and gitster committed Jan 4, 2011
    t/README recommends chaining test assertions.
    
    Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. cvsimport: handle the parsing of uppercase config options

    mjg authored and gitster committed Dec 29, 2010
    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 thus
    config.R) but a remote name for -r (and thus config.r).
    
    Fix this by making cvsimport expect long names for uppercase options.
    
    config options for cvsimport have been undocumented so far, though
    present in the code and advertised in several tutorials. So one may read
    "enhance" for "fix". Similarly, the names for the options are
    "documented" in the code, waitiing for their lowercase equivalents to be
    transformed into long config options, as well.
    
    Helped-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'maint'

    gitster committed Jan 4, 2011
    * maint:
      gitweb: skip logo in atom feed when there is none
      t9001: Fix test prerequisites
  4. daemon: support <directory> arguments again

    jrn authored and gitster committed Jan 4, 2011
    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 child behavior does
    not kick in.  So the child becomes an ordinary git daemon process,
    notices that all the addresses it needs are in use, and exits with
    the message "fatal: unable to allocate any listen sockets on port
    9418".
    
    Fix it by putting --serve at the beginning of the command line,
    where the flag cannot be mistaken for a path argument.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Fix typos in the documentation

    Ralf Wildenhues authored and gitster committed Jan 3, 2011
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. gitweb: skip logo in atom feed when there is none

    jrn authored and gitster committed Sep 4, 2010
    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>
Commits on Dec 29, 2010
  1. t9001: Fix test prerequisites

    robbat2 authored and gitster committed Dec 29, 2010
    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>
Commits on Dec 28, 2010
  1. Git 1.7.4-rc0

    gitster committed Dec 28, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint'

    gitster committed Dec 28, 2010
    * 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
  3. Prepare for 1.7.3.5

    gitster committed Dec 28, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'jk/commit-die-on-bogus-ident' into maint

    gitster committed Dec 28, 2010
    * jk/commit-die-on-bogus-ident:
      commit: die before asking to edit the log message
      ident: die on bogus date format
  5. Merge branch 'ks/blame-worktree-textconv-cached' into maint

    gitster committed Dec 28, 2010
    * 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
  6. Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint

    gitster committed Dec 28, 2010
    * jc/maint-rebase-rewrite-last-skip:
      rebase --skip: correctly wrap-up when skipping the last patch
  7. Merge branch 'jc/maint-am-abort-safely' into maint

    gitster committed Dec 28, 2010
    * jc/maint-am-abort-safely:
      am --abort: keep unrelated commits since the last failure and warn
  8. Merge branch 'kb/maint-status-cquote' into maint

    gitster committed Dec 28, 2010
    * kb/maint-status-cquote:
      status: Quote paths with spaces in short format
  9. t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'

    drafnel authored and gitster committed Dec 22, 2010
    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.
    
    See also:
    
    907a0b1
    84eeb68
    3fee1fe
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. Merge branch 'jc/maint-rebase-rewrite-last-skip'

    gitster committed Dec 28, 2010
    * jc/maint-rebase-rewrite-last-skip:
      rebase --skip: correctly wrap-up when skipping the last patch
  11. Merge branch 'nd/setup'

    gitster committed Dec 28, 2010
    * 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-subdirectory: test alias expansion in a subdirectory
      setup: clean up setup_bare_git_dir()
      setup: limit get_git_work_tree()'s to explicit setup case only
      Use git_config_early() instead of git_config() during repo setup
      Add git_config_early()
      git-rev-parse.txt: clarify --git-dir
      t1510: setup case #31
      t1510: setup case #30
      t1510: setup case #29
      t1510: setup case #28
      t1510: setup case #27
      t1510: setup case #26
      t1510: setup case #25
      ...
  12. Fix false positives in t3404 due to SHELL=/bin/false

    robbat2 authored and gitster committed Dec 27, 2010
    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. Johnson" <robbat2@gentoo.org>
    X-Gentoo-Bug: 349083
    X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=349083
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 27, 2010
  1. setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd

    pclouds authored and gitster committed Dec 27, 2010
    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 <michelbriand@free.fr>
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 26, 2010
  1. Merge branch 'rs/maint-diff-fd-leak' into maint

    gitster committed Dec 26, 2010
    * rs/maint-diff-fd-leak:
      close file on error in read_mmfile()
  2. close file on error in read_mmfile()

    René Scharfe authored and gitster committed Dec 25, 2010
    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>
Commits on Dec 23, 2010
  1. Merge branch 'rj/maint-difftool-cygwin-workaround'

    gitster committed Dec 23, 2010
    * rj/maint-difftool-cygwin-workaround:
      difftool: Fix failure on Cygwin
  2. Merge branch 'maint'

    gitster committed Dec 23, 2010
    * maint:
      test-lib.sh/test_decode_color(): use octal not hex in awk script
  3. Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections

    drafnel authored and gitster committed Dec 22, 2010
    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>
  4. test-lib.sh/test_decode_color(): use octal not hex in awk script

    drafnel authored and gitster committed Dec 22, 2010
    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@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. rebase --skip: correctly wrap-up when skipping the last patch

    gitster committed Dec 23, 2010
    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>
Commits on Dec 22, 2010
  1. t0021: avoid getting filter killed with SIGPIPE

    gitster committed Dec 22, 2010
    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>