Permalink
Switch branches/tags
Commits on Dec 2, 2010
  1. Git 1.7.0.8

    gitster committed Dec 2, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 1, 2010
  1. add: introduce add.ignoreerrors synonym for add.ignore-errors

    jrn committed with gitster Dec 1, 2010
    The "[add] ignore-errors" tweakable introduced by v1.5.6-rc0~30^2 (Add
    a config option to ignore errors for git-add, 2008-05-12) does not
    follow the usual convention for naming values in the git configuration
    file.
    
    What convention?  Glad you asked.
    
    	The section name indicates the affected subsystem.
    
    	The subsection name, if any, indicates which of
    	an unbound set of things to set the value for.
    
    	The variable name describes the effect of tweaking
    	this knob.
    
    	The section and variable names can be broken into
    	words using bumpyCaps in documentation as a hint to
    	the reader.  These word breaks are not significant
    	at the level of code, since the section and variable
    	names are not case sensitive.
    
    The name "add.ignore-errors" includes a dash, meaning a naive
    configuration file like
    
    	[add]
    		ignoreErrors
    
    does not have any effect.  Avoid such confusion by renaming to the
    more consistent add.ignoreErrors, but keep the old version for
    backwards compatibility.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 27, 2010
  1. Git 1.7.0.7

    gitster committed Jul 27, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. config --get --path: check for unset $HOME

    jrn committed with gitster Jul 26, 2010
    If $HOME is unset (as in some automated build situations),
    currently
    
    	git config --path path.home "~"
    	git config --path --get path.home
    
    segfaults.  Error out with
    
    	Failed to expand user dir in: '~/'
    
    instead.
    
    Reported-by: Julien Cristau <jcristau@debian.org>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 26, 2010
  1. Merge branch 'maint-1.6.6' into maint-1.7.0

    gitster committed Jul 26, 2010
    * maint-1.6.6:
      request-pull.txt: Document -p option
      Check size of path buffer before writing into it
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
  2. Merge branch 'maint-1.6.5' into maint-1.6.6

    gitster committed Jul 26, 2010
    * maint-1.6.5:
      request-pull.txt: Document -p option
      Check size of path buffer before writing into it
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
  3. request-pull.txt: Document -p option

    bebarino committed with gitster Jul 23, 2010
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'maint-1.6.4' into maint-1.6.5

    gitster committed Jul 26, 2010
    * maint-1.6.4:
      Check size of path buffer before writing into it
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
Commits on Jul 25, 2010
  1. Check size of path buffer before writing into it

    Greg Brockman committed with gitster Jul 20, 2010
    This prevents a buffer overrun that could otherwise be triggered by
    creating a file called '.git' with contents
    
      gitdir: (something really long)
    
    Signed-off-by: Greg Brockman <gdb@mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 7, 2010
  1. rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option

    Uwe Kleine-König committed with gitster Jul 6, 2010
    The ?: operator has a lower priority than |, so the implicit associativity
    made the 6th argument of parse_options be PARSE_OPT_KEEP_DASHDASH if
    keep_dashdash was true discarding PARSE_OPT_STOP_AT_NON_OPTION and
    PARSE_OPT_SHELL_EVAL.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 29, 2010
  1. Documentation/config: describe status.submodulesummary

    mjg committed with gitster May 20, 2010
    ac8d5af (builtin-status: submodule summary support, 2008-04-12)
    intoduced this variable and described it in git-status[1].
    
    Include this description in git-config[1], as well.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 28, 2010
  1. Makefile: reenable install with NO_CURL

    mjg committed with gitster May 26, 2010
    Setting NO_CURL leaves some variables like REMOTE_CURL_ALIASES
    empty, which creates no fun when for-looping over
    $(REMOTE_CURL_ALIASES) unconditionally. Make it conditional.
    
    Reported-by: Paul Walker <PWalker752@aol.com>
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 4, 2010
  1. remove ecb parameter from xdi_diff_outf()

    René Scharfe committed with gitster May 4, 2010
    xdi_diff_outf() overrides the structure members of its last parameter,
    ignoring any value that callers pass in.  It's no surprise then that all
    callers pass a pointer to an uninitialized structure.  They also don't
    read it after the call, so the parameter is neither used for input nor
    for output.   Turn it into a local variable of xdi_diff_outf().
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 1, 2010
  1. index-pack: fix trivial typo in usage string

    mjg committed with gitster Apr 29, 2010
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. git-submodule.sh: properly initialize shell variables

    Gerrit Pape committed with gitster Apr 26, 2010
    git-submodule inherits variables from the environment it is started in,
    expects the internal variables init= and recursive= to have an empty
    value, but doesn't initialize them appropriately.  Thanks to the
    selftests, this can be reproduced through
    
     init=1 make test
     recursive=1 make test
    
    With this commit the variables are initialized, and the selftests
    succeed even if these variables have some values in the environment.
    
    The bug was discovered through the Debian autobuilders
     http://bugs.debian.org/569594
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 23, 2010
  1. Documentation improvements for the description of short format.

    Eric Raymond committed with gitster Apr 23, 2010
    Incorporates the detailed explanation from Jeff King in
    <20100410040959.GA11977@coredump.intra.peff.net> and fixes
    the bug noted by Junio C Hamano in
    <7vmxxc1i8g.fsf@alter.siamese.dyndns.org>.
    
    Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Git 1.7.0.6

    gitster committed Apr 23, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maint

    gitster committed Apr 23, 2010
    * mg/use-default-abbrev-length-in-rev-list:
      rev-list: use default abbrev length when abbrev-commit is in effect
  4. Merge branch 'wp/doc-filter-direction' into maint

    gitster committed Apr 23, 2010
    * wp/doc-filter-direction:
      documentation: clarify direction of core.autocrlf
  5. Merge branch 'jk/maint-diffstat-overflow' into maint

    gitster committed Apr 23, 2010
    * jk/maint-diffstat-overflow:
      diff: use large integers for diffstat calculations
  6. Merge branch 'da/maint-python-startup' into maint

    gitster committed Apr 23, 2010
    * da/maint-python-startup:
      Makefile: Remove usage of deprecated Python "has_key" method
Commits on Apr 22, 2010
  1. Documentation/Makefile: fix interrupted builds of user-manual.xml

    jrn committed with gitster Apr 22, 2010
    Unlike gcc, asciidoc does not atomically write its output file or
    delete it when interrupted.  If it is interrupted in the middle of
    writing an XML file, the result will be truncated input for xsltproc.
    
    	XSLTPROC user-manual.html
    	user-manual.xml:998: parser error : Premature end of data in t
    
    Take care of this case by writing to a temporary and renaming it when
    finished.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 20, 2010
  1. t7012: Mark missing tests as TODO

    mjg committed with gitster Apr 19, 2010
    Currently, there are 6 tests which are not even written but are
    'test_expect_failure message false'.
    Do not abuse test_expect_failure as a to do marker, but mark them as
    '#TODO' instead.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Acked-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. reflog: remove 'show' from 'expire's usage string

    szeder committed with gitster Apr 19, 2010
    Most of 'expire's options are not recognized by the 'show' subcommand,
    hence it errors out.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 19, 2010
  1. Merge branch 'maint-1.6.6' into maint

    gitster committed Apr 19, 2010
    * maint-1.6.6:
      MSVC: Fix build by adding missing termios.h dummy
  2. MSVC: Fix build by adding missing termios.h dummy

    j6t committed with gitster Apr 19, 2010
    A use of this header file was introduced in eb80042 (Add missing #include
    to support TIOCGWINSZ on Solaris, 2010-01-11).
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 18, 2010
  1. Documentation: Describe other situations where -z affects git diff

    hashpling committed with gitster Apr 18, 2010
    -z also alters the behaviour of --name-only and --name-status.
    
    Signed-off-by: Charles Bailey <charles@hashpling.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 17, 2010