Permalink
Commits on Dec 15, 2010
  1. Git 1.7.2.5

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

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

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

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

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

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 15, 2010
  7. 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 14, 2010
Commits on Dec 2, 2010
  1. Git 1.7.2.4

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

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

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

    * maint-1.7.1:
      add: introduce add.ignoreerrors synonym for add.ignore-errors
    gitster committed Dec 2, 2010
  5. 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 2, 2010
Commits on Dec 1, 2010
  1. 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
  2. bash: Match lightweight tags in prompt

    The bash prompt would display a commit's object name when having checked
    out a lightweight tag.  Provide `--tags` to `git describe` in the completion
    script, so it will display lightweight tag names, as it already does for
    annotated tags.
    
    Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    knittl committed with gitster Dec 1, 2010
  3. git-commit.txt: (synopsis): move -i and -o before "--"

    All options, including -i and -o, must come before "--" which is the
    end of options marker.
    
    Reported-by: Joey Hess <joey@kitenet.net>
    Signed-off-by: Jari Aalto <jari.aalto@cante.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jaalto committed with gitster Dec 1, 2010
Commits on Sep 12, 2010
  1. t3101: modernise style

    Also add a few " &&" cascade that were missing.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 11, 2010
Commits on Sep 11, 2010
  1. compat/nedmalloc: don't force NDEBUG on the rest of git

    Define the nedmalloc feature configuration macros for nedmalloc.o, only.
    This keeps assert(3) working for the rest of the git source; it was
    turned off for nedmalloc users before by defining NDEBUG globally.
    
    Also remove -DUSE_NED_ALLOCATOR as this macro isn't used anywhere.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Sep 11, 2010
Commits on Sep 10, 2010
  1. config.txt: fix placement of diff.noprefix

    In git-config(1), diff.noprefix was placed in between
    diff.mnemonicprefix and the list of mnemonic prefixes, which is
    obviously incorrect and very confusing to readers.  Now, it is located
    after the end of the explanation of mnemonicprefix, which makes much
    more sense.
    
    Signed-off-by: Mark Lodato <lodatom@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MarkLodato committed with gitster Sep 10, 2010
  2. xdiff-interface.c: always trim trailing space from xfuncname matches

    Generally, trailing space is removed from the string matched by the
    xfuncname patterns.  The exception is when the matched string exceeds the
    length of the fixed-size buffer that it will be copied in to.  But, a
    string that exceeds the buffer can still contain trailing space in the
    portion of the string that will be copied into the buffer.  So, simplify
    this code slightly, and just perform the trailing space removal always.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Sep 9, 2010
  3. diff.c: call regfree to free memory allocated by regcomp when necessary

    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Sep 9, 2010
Commits on Sep 7, 2010
  1. revert: Fix trivial comment style issue

    Signed-off-by: Elijah Newren <newren@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    newren committed with gitster Sep 6, 2010
  2. cache_tree_free: Fix small memory leak

    Signed-off-by: Elijah Newren <newren@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    newren committed with gitster Sep 6, 2010
Commits on Sep 6, 2010
  1. Merge branch 'xx/trivial' into maint

    * xx/trivial:
      tag.c: whitespace breakages fix
      Fix whitespace issue in object.c
      t5505: add missing &&
    gitster committed Sep 6, 2010
  2. tag.c: whitespace breakages fix

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 6, 2010
  3. Fix whitespace issue in object.c

    Change some expanded tabs (spaces) to tabs in object.c.
    
    Signed-off-by: Jared Hance <jaredhance@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jhance committed with gitster Sep 5, 2010
  4. t5505: add missing &&

    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jlehmann committed with gitster Sep 5, 2010
Commits on Sep 3, 2010
  1. Git 1.7.2.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 3, 2010
  2. builtin/merge_recursive.c: Add an usage string and make use of it.

    This improves the usage output by adding builtin_merge_recursive_usage string
    that follows the same pattern used by the other builtin commands.
    
    The previous output for git merger-recursive was:
    usage: merge-recursive <base>... -- <head> <remote> ...
    
    Now the output is:
    usage: git merge-recursive <base>... -- <head> <remote> ...
    
    Since cmd_merge_recursive is used to handle four different commands we need
    the %s in the usage string, so the following example:
    
    $ git merge-subtree -h
    
    Will output:
    usage: git merge-subtree <base>... -- <head> <remote> ...
    
    Signed-off-by: Thiago Farina <tfransosi@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Thiago Farina committed with gitster Aug 30, 2010
Commits on Sep 1, 2010
  1. Prepare for 1.7.2.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 1, 2010
  2. Merge branch 'gp/pack-refs-remove-empty-dirs' into maint

    * gp/pack-refs-remove-empty-dirs:
      pack-refs: remove newly empty directories
    gitster committed Sep 1, 2010
  3. Merge branch 'sg/rerere-gc-old-still-used' into maint

    * sg/rerere-gc-old-still-used:
      rerere: fix overeager gc
      mingw_utime(): handle NULL times parameter
    gitster committed Sep 1, 2010
  4. Merge branch 'np/maint-huge-delta-generation' into maint

    * np/maint-huge-delta-generation:
      fix >4GiB source delta assertion failure
    gitster committed Sep 1, 2010
  5. Merge branch 'dj/fetch-tagopt' into maint

    * dj/fetch-tagopt:
      fetch: allow command line --tags to override config
    gitster committed Sep 1, 2010
  6. Merge branch 'da/fix-submodule-sync-superproject-config' into maint

    * da/fix-submodule-sync-superproject-config:
      submodule sync: Update "submodule.<name>.url"
    gitster committed Sep 1, 2010
  7. Merge branch 'en/rebase-against-rebase-fix' into maint

    * en/rebase-against-rebase-fix:
      pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
      t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
    gitster committed Sep 1, 2010