Skip to content
Commits on Dec 2, 2010
  1. @gitster

    Git 1.7.0.8

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 2, 2010
Commits on Dec 1, 2010
  1. @jrn @gitster

    add: introduce add.ignoreerrors synonym for add.ignore-errors

    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>
    jrn committed with gitster Dec 1, 2010
Commits on Jul 27, 2010
  1. @gitster

    Git 1.7.0.7

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 27, 2010
  2. @jrn @gitster

    config --get --path: check for unset $HOME

    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>
    jrn committed with gitster Jul 26, 2010
Commits on Jul 26, 2010
  1. @gitster

    Merge branch 'maint-1.6.6' into maint-1.7.0

    * 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
    gitster committed Jul 25, 2010
  2. @gitster

    Merge branch 'maint-1.6.5' into maint-1.6.6

    * 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
    gitster committed Jul 25, 2010
  3. @bebarino @gitster

    request-pull.txt: Document -p option

    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bebarino committed with gitster Jul 23, 2010
  4. @gitster

    Merge branch 'maint-1.6.4' into maint-1.6.5

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

    Check size of path buffer before writing into it

    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>
    Greg Brockman committed with gitster Jul 20, 2010
Commits on Jul 7, 2010
  1. @gitster

    rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option

    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>
    Uwe Kleine-König committed with gitster Jul 6, 2010
Commits on May 29, 2010
  1. @mjg @gitster

    Documentation/config: describe status.submodulesummary

    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>
    mjg committed with gitster May 20, 2010
Commits on May 28, 2010
  1. @mjg @gitster

    Makefile: reenable install with NO_CURL

    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>
    mjg committed with gitster May 26, 2010
Commits on May 4, 2010
  1. @gitster

    remove ecb parameter from xdi_diff_outf()

    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>
    René Scharfe committed with gitster May 4, 2010
Commits on May 1, 2010
  1. @mjg @gitster

    index-pack: fix trivial typo in usage string

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

    git-submodule.sh: properly initialize shell variables

    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>
    Gerrit Pape committed with gitster Apr 26, 2010
Commits on Apr 23, 2010
  1. @gitster

    Documentation improvements for the description of short format.

    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>
    Eric Raymond committed with gitster Apr 23, 2010
  2. @gitster

    Git 1.7.0.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 22, 2010
  3. @gitster

    Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maint

    * mg/use-default-abbrev-length-in-rev-list:
      rev-list: use default abbrev length when abbrev-commit is in effect
    gitster committed Apr 22, 2010
  4. @gitster

    Merge branch 'wp/doc-filter-direction' into maint

    * wp/doc-filter-direction:
      documentation: clarify direction of core.autocrlf
    gitster committed Apr 22, 2010
  5. @gitster

    Merge branch 'jk/maint-diffstat-overflow' into maint

    * jk/maint-diffstat-overflow:
      diff: use large integers for diffstat calculations
    gitster committed Apr 22, 2010
  6. @gitster

    Merge branch 'da/maint-python-startup' into maint

    * da/maint-python-startup:
      Makefile: Remove usage of deprecated Python "has_key" method
    gitster committed Apr 22, 2010
Commits on Apr 22, 2010
  1. @jrn @gitster

    Documentation/Makefile: fix interrupted builds of user-manual.xml

    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>
    jrn committed with gitster Apr 21, 2010
Commits on Apr 20, 2010
  1. @mjg @gitster

    t7012: Mark missing tests as TODO

    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>
    mjg committed with gitster Apr 19, 2010
  2. @szeder @gitster

    reflog: remove 'show' from 'expire's usage string

    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>
    szeder committed with gitster Apr 19, 2010
Commits on Apr 19, 2010
  1. @gitster

    Merge branch 'maint-1.6.6' into maint

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

    MSVC: Fix build by adding missing termios.h dummy

    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>
    j6t committed with gitster Apr 19, 2010
Commits on Apr 18, 2010
  1. @hashpling @gitster

    Documentation: Describe other situations where -z affects git diff

    -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>
    hashpling committed with gitster Apr 18, 2010
Commits on Apr 17, 2010
  1. @wpalmer @gitster

    documentation: clarify direction of core.autocrlf

    The description for core.autocrlf refers to reads from / writes to
    "the filesystem", the only use of this rather ambiguous term, which
    technically could be referring to the git object database. (All other
    mentions are part of phrases such as "..filesystems (like NFS)..").
    
    Other sections, including the section on core.safecrlf, use the term
    "work tree" for the same purpose as the term "the filesystem" is used in
    the core.autocrlf section, so that seems like a good alternative, which
    makes it clearer what direction the addition/removal of CR characters
    occurs in.
    
    Signed-off-by: Will Palmer <wmpalmer@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    wpalmer committed with gitster Apr 17, 2010
  2. @peff @gitster

    diff: use large integers for diffstat calculations

    The diffstat "added" and "changed" fields generally store
    line counts; however, for binary files, they store file
    sizes. Since we store and print these values as ints, a
    diffstat on a file larger than 2G can show a negative size.
    Instead, let's use uintmax_t, which should be at least 64
    bits on modern platforms.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Apr 17, 2010
  3. @mjg @gitster

    t1010-mktree: Adjust expected result to code and documentation

    The last two tests here were always supposed to fail in the sense
    that, according to code and documentation, mktree should read non-recursive
    ls-tree output, but not recursive one, and therefore explicitely refuses
    to deal with slashes.
    
    Adjust the test (must_fail) so that it succeeds when mktree dies on
    slashes.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Apr 15, 2010
  4. @trast @gitster

    combined diff: correctly handle truncated file

    Consider an evil merge of two commits A and B, both of which have a
    file 'foo', but the merge result does not have that file.
    
    The combined-diff code learned in 4462731 (combine-diff: do not punt
    on removed or added files., 2006-02-06) to concisely show only the
    removal, since that is the evil part and the previous contents are
    presumably uninteresting.
    
    However, to diagnose an empty merge result, it overloaded the variable
    that holds the file's length.  This means that the check also triggers
    for truncated files.  Consequently, such files were not shown in the
    diff at all despite the merge being clearly evil.
    
    Fix this by adding a new variable that distinguishes whether the file
    was deleted (which is the case 4462731 handled) or truncated.  In the
    truncated case, we show the full combined diff again, which is rather
    spammy but at least does not hide the evilness.
    
    Reported-by: David Martínez Martí <desarrollo@gestiweb.com>
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Apr 15, 2010
Commits on Apr 15, 2010
  1. @jrn @gitster

    Document new "already-merged" rule for branch -d

    v1.7.0-rc0~18^2 (branch -d: base the "already-merged" safety on the
    branch it merges with, 2009-12-29) taught ‘git branch’ a new heuristic
    for when it is safe to delete a branch without forcing the issue.  It
    is safe to delete a branch "topic" without second thought if:
    
     - the branch "topic" is set up to pull from a (remote-tracking,
       usually) branch and is fully merged in that "upstream" branch, or
    
     - there is no branch.topic.merge configuration and branch "topic" is
       fully merged in the current HEAD.
    
    Update the man page to acknowledge the new rules.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Apr 15, 2010
Commits on Apr 13, 2010
  1. @jaysoffian @gitster

    Documentation/config.txt: default gc.aggressiveWindow is 250, not 10

    The default for gc.aggressiveWindow has been 250 since 1c192f3
    (gc --aggressive: make it really aggressive, 2007-12-06).
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jaysoffian committed with gitster Apr 13, 2010
Commits on Apr 12, 2010
  1. @marcnarc @gitster

    Docs: Add -X option to git-merge's synopsis.

    Also move -X's description next to -s's in merge-options.txt.
    
    This makes it easier to learn how to specify merge strategy options.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcnarc committed with gitster Apr 12, 2010
Commits on Apr 11, 2010
  1. @gitster

    Git 1.7.0.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 11, 2010
Something went wrong with that request. Please try again.