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

    Git 1.7.1.4

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

    Git 1.7.0.9

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

    Git 1.6.6.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 15, 2010
  4. @gitster

    Git 1.6.5.9

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 15, 2010
  5. @gitster

    Git 1.6.4.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 15, 2010
  6. @jnareb @gitster

    gitweb: Introduce esc_attr to escape attributes of HTML elements

    It is needed only to escape attributes of handcrafted HTML elements,
    and not those generated using CGI.pm subroutines / methods for HTML
    generation.
    
    While at it, add esc_url and esc_html where needed, and prefer to use
    CGI.pm HTML generating methods than handcrafted HTML code.  Most of
    those are probably unnecessary (could be exploited only by person with
    write access to gitweb config, or at least access to the repository).
    
    This fixes CVE-2010-3906
    
    Reported-by: Emanuele Gentili <e.gentili@tigersecurity.it>
    Helped-by: John 'Warthog9' Hawley <warthog9@kernel.org>
    Helped-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jnareb committed with gitster Dec 15, 2010
Commits on Dec 2, 2010
  1. @gitster

    Git 1.7.1.3

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

    Git 1.7.0.8

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

    Merge branch 'maint-1.7.0' into maint-1.7.1

    * maint-1.7.0:
      add: introduce add.ignoreerrors synonym for add.ignore-errors
    gitster committed Dec 1, 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 Aug 30, 2010
  1. @moy @gitster

    t0003: add missing && at end of lines

    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Aug 28, 2010
Commits on Jul 27, 2010
  1. @gitster

    Git 1.7.1.2

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

    Sync with 1.7.0 series

    gitster committed Jul 27, 2010
  3. @gitster

    Git 1.7.0.7

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 27, 2010
  4. @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.7.0' into maint-1.7.1

    * maint-1.7.0:
      request-pull.txt: Document -p option
      Check size of path buffer before writing into it
    gitster committed Jul 25, 2010
  2. @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
  3. @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
  4. @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
  5. @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 20, 2010
  1. @drafnel @gitster

    t/README: clarify test_must_fail description

    Some have found the wording of the description to be somewhat ambiguous
    with respect to when it is desirable to use test_must_fail instead of
    "! <git-command>".  Tweak the wording somewhat to hopefully clarify that
    it is _because_ test_must_fail can detect segmentation fault that it is
    desirable to use it instead of "! <git-command>".
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Jul 20, 2010
  2. @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 19, 2010
  1. @ralfth @gitster

    update-server-info: Shorten read_pack_info_file()

    The correct responses to a D and a T line in .git/objects/info/packs
    are the same, so combine their case arms.  In both cases we already
    ‘goto’ out of the switch so while at it, remove a redundant ‘break’
    to avoid yet another line of code.
    
    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
    Reviewed-by: Jonathan Nieder <jrnieder <at> gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ralfth committed with gitster Jul 19, 2010
  2. @davvid @gitster

    Documentation: Explain git-mergetool's use of temporary files

    'git mergetool' creates '*.orig' backup files in its
    default configuration.  Mention this in its documentation.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    davvid committed with gitster Jul 17, 2010
Commits on Jul 15, 2010
  1. @jrn @gitster

    Documentation: add submodule.* to the big configuration variable list

    The url, path, and the update items in [submodule "foo"] stanzas
    are nicely explained in the .gitmodules and ‘git submodule’
    documentation.  Point there from the config documentation.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Jul 15, 2010
  2. @jrn @gitster

    gitmodules.5: url can be a relative path

    There is already excellent documentation for this facility in
    git-submodule.1, but it is not so discoverable.
    
    Relative paths in .gitmodules can be useful for serving the
    same repository over multiple protocols, for example.
    Thanks to Peter for pointing this out.
    
    Cc: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Jul 15, 2010
  3. @pksunkara @gitster

    gitweb: fix esc_url

    Earlier, 452e225 (gitweb: fix esc_param, 2009-10-13) fixed CGI escaping
    rules used in esc_url.  A very similar logic exists in esc_param and needs
    to be fixed the same way.
    
    Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pksunkara committed with gitster Jul 15, 2010
Commits on Jul 13, 2010
  1. @orenhe @gitster

    git fetch documentation: describe short '-p' synonym to '--prune' option

    It's already implemented, just undocumented.
    
    Signed-off-by: Oren Held <orenhe@il.ibm.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    orenhe committed with gitster Jul 13, 2010
  2. @gitster

    format-patch: document the format.to configuration setting

    [jc: with simplification from Jonathan Nieder]
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Jul 12, 2010
Commits on Jul 10, 2010
  1. @frsk @gitster

    Documentation: Spelling fix in protocol-capabilities.txt

    Signed-off-by: Fredrik Skolmli <fredrik@frsk.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    frsk committed with gitster Jul 10, 2010
Commits on Jul 9, 2010
  1. @gitster

    checkout: accord documentation to what git does

    Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nicolas Sebrecht committed with gitster Jul 9, 2010
  2. @j6t @gitster

    t0005: work around strange $? in ksh when program terminated by a signal

    ksh93 is known to report $? of programs that terminated by a signal as
    256 + signal number instead of 128 + signal number like other POSIX
    compliant shells (ksh's behavior is still POSIX compliant in this regard).
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    j6t committed with gitster Jul 9, 2010
Commits on Jul 7, 2010
  1. @gitster

    backmerge a few more fixes to 1.7.1.X series

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

    Merge branch 'maint-1.6.4' into maint

    * maint-1.6.4:
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
    gitster committed Jul 7, 2010
Something went wrong with that request. Please try again.