Permalink
Commits on Dec 15, 2010
  1. Git 1.6.5.9

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

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 15, 2010
  3. 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 Jul 26, 2010
  1. 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
  2. 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 26, 2010
Commits on Jul 25, 2010
  1. 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. 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 Mar 5, 2010
  1. Remove extra '-' from git-am(1)

    Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    wentasah committed with gitster Mar 4, 2010
Commits on Feb 16, 2010
  1. dwim_ref: fix dangling symref warning

    If we encounter a symref that is dangling, in most cases we will warn
    about it. The one exception is a dangling HEAD, as that indicates a
    branch yet to be born.
    
    However, the check in dwim_ref was not quite right. If we were fed
    something like "HEAD^0" we would try to resolve "HEAD", see that it is
    dangling, and then check whether the _original_ string we got was
    "HEAD" (which it wasn't in this case). And that makes no sense; the
    dangling thing we found was not "HEAD^0" but rather "HEAD".
    
    Fixing this squelches a scary warning from "submodule summary HEAD" (and
    consequently "git status" with status.submodulesummary set) in an empty
    repo, as the submodule script calls "git rev-parse -q --verify HEAD^0".
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Feb 16, 2010
  2. stash pop: remove 'apply' options during 'drop' invocation

    The 'git stash pop' option parsing used to remove the first argument
    in --index mode.  At the time this was implemented, this first
    argument was always --index.  However, since the invention of the -q
    option in fcdd0e9 (stash: teach quiet option, 2009-06-17) you can
    cause an internal invocation of
    
      git stash drop --index
    
    by running
    
      git stash pop -q --index
    
    which then of course fails because drop doesn't know --index.
    
    To handle this, instead let 'git stash apply' decide what the future
    argument to 'drop' should be.
    
    Warning: this means that 'git stash apply' must parse all options that
    'drop' can take, and deal with them in the same way.  This is
    currently true for its only option -q.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Acked-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Feb 15, 2010
  3. diff: make sure --output=/bad/path is caught

    The return value from fopen wasn't being checked.
    
    Signed-off-by: Larry D'Anna <larry@elder-gods.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    smoofra committed with gitster Feb 16, 2010
Commits on Feb 10, 2010
  1. t8003: check exit code of command and error message separately

    Shell reports exit status only from the most downstream command
    in a pipeline.  In these tests, we want to make sure that the
    command fails in a controlled way, and produces a correct error
    message.
    
    This issue was known by Jay who submitted the patch, and also was
    pointed out by Hannes during the review process, but I forgot to
    fix it up before applying.  Sorry about that.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 9, 2010
Commits on Feb 9, 2010
  1. blame: prevent a segv when -L given start > EOF

    blame would segv if given -L <lineno> with <lineno> past the end of the file.
    While we're fixing the bug, add test cases for an invalid <start> when called
    as -L <start>,<end> or -L<start>.
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jaysoffian committed with gitster Feb 9, 2010
Commits on Feb 1, 2010
  1. Merge branch 'sb/maint-octopus' into maint-1.6.5

    * sb/maint-octopus:
      octopus: remove dead code
      octopus: reenable fast-forward merges
      octopus: make merge process simpler to follow
    gitster committed Feb 1, 2010
  2. Merge branch 'bg/maint-add-all-doc' into maint-1.6.5

    * bg/maint-add-all-doc:
      git-rm doc: Describe how to sync index & work tree
      git-add/rm doc: Consistently back-quote
      Documentation: 'git add -A' can remove files
    gitster committed Feb 1, 2010
Commits on Jan 29, 2010
  1. fix memcpy of overlapping area

    Caught by valgrind in t5500, but it is pretty obvious from
    reading the code that this is shifting elements of an array
    to the left, which needs memmove.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jan 29, 2010
Commits on Jan 20, 2010
  1. Git 1.6.5.8

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 20, 2010
  2. Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5

    * jk/maint-1.6.5-reset-hard:
      reset: unbreak hard resets with GIT_WORK_TREE
    gitster committed Jan 20, 2010
  3. Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into…

    … maint-1.6.5
    
    * tr/maint-1.6.5-bash-prompt-show-submodule-changes:
      bash completion: factor submodules into dirty state
    gitster committed Jan 20, 2010
  4. Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1…

    ….6.5
    
    * dp/maint-1.6.5-fast-import-non-commit-tag:
      fast-import: tag may point to any object type
    gitster committed Jan 20, 2010
  5. Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5

    * jm/maint-1.6.5-grep-NUL-terminate:
      grep: NUL terminate input from a file
    gitster committed Jan 20, 2010
Commits on Jan 19, 2010
  1. Merge branch 'maint-1.6.4' into maint-1.6.5

    * maint-1.6.4:
      Fix mis-backport of t7002
      base85: Make the code more obvious instead of explaining the non-obvious
      base85: encode_85() does not use the decode table
      base85 debug code: Fix length byte calculation
      checkout -m: do not try to fall back to --merge from an unborn branch
      branch: die explicitly why when calling "git branch [-a|-r] branchname".
      textconv: stop leaking file descriptors
      commit: --cleanup is a message option
      git count-objects: handle packs bigger than 4G
      t7102: make the test fail if one of its check fails
    gitster committed Jan 19, 2010
  2. Merge branch 'maint-1.6.3' into maint-1.6.4

    * maint-1.6.3:
      base85: Make the code more obvious instead of explaining the non-obvious
      base85: encode_85() does not use the decode table
      base85 debug code: Fix length byte calculation
      checkout -m: do not try to fall back to --merge from an unborn branch
      branch: die explicitly why when calling "git branch [-a|-r] branchname".
      textconv: stop leaking file descriptors
      commit: --cleanup is a message option
      git count-objects: handle packs bigger than 4G
      t7102: make the test fail if one of its check fails
    
    Conflicts:
    	builtin-commit.c
    gitster committed Jan 19, 2010
  3. Merge branch 'maint-1.6.2' into maint-1.6.3

    * maint-1.6.2:
      base85: Make the code more obvious instead of explaining the non-obvious
      base85: encode_85() does not use the decode table
      base85 debug code: Fix length byte calculation
      checkout -m: do not try to fall back to --merge from an unborn branch
      branch: die explicitly why when calling "git branch [-a|-r] branchname".
      textconv: stop leaking file descriptors
      commit: --cleanup is a message option
      git count-objects: handle packs bigger than 4G
      t7102: make the test fail if one of its check fails
    
    Conflicts:
    	diff.c
    gitster committed Jan 19, 2010
  4. Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4

    * commit 'v1.6.4.4-8-g8de6518':
      Fix mis-backport of t7002
    gitster committed Jan 19, 2010
  5. Fix mis-backport of t7002

    The original patch that became cfe370c (grep: do not segfault when -f is
    used, 2009-10-16), was made against "maint" or newer branch back then, but
    the fix addressed the issue that was present as far as in 1.6.4 series.
    
    The maintainer backported the patch to the 1.6.4 maintenance branch, but
    failed to notice that the new tests assumed the setup done by the script
    in "maint", which did quite a lot more than the same test script in 1.6.4
    series, and the output didn't match the expected result.
    
    This should fix it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 19, 2010
  6. grep: NUL terminate input from a file

    Internally "git grep" runs regexec(3) that expects its input string
    to be NUL terminated.  When searching inside blob data, read_sha1_file()
    automatically gives such a buffer, but builtin-grep.c forgot to put
    the NUL at the end, even though it allocated enough space for it.
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster Jan 18, 2010
Commits on Jan 15, 2010
  1. fast-import: tag may point to any object type

    If you tried to export the official git repository, and then to import it
    back then git-fast-import would die complaining that "Mark :1 not a commit".
    
    Accordingly to a generated crash file, Mark 1 is not a commit but a blob,
    which is pointed by junio-gpg-pub tag. Because git-tag allows to create such
    tags, git-fast-import should import them.
    
    Signed-off-by: Dmitry Potapov <dpotapov@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dmpot committed with gitster Jan 14, 2010
Commits on Jan 10, 2010
  1. Merge branch 'maint-1.6.1' into maint-1.6.2

    * maint-1.6.1:
      base85: Make the code more obvious instead of explaining the non-obvious
      base85: encode_85() does not use the decode table
      base85 debug code: Fix length byte calculation
      checkout -m: do not try to fall back to --merge from an unborn branch
      branch: die explicitly why when calling "git branch [-a|-r] branchname".
      textconv: stop leaking file descriptors
      commit: --cleanup is a message option
      git count-objects: handle packs bigger than 4G
      t7102: make the test fail if one of its check fails
    
    Conflicts:
    	diff.c
    gitster committed Jan 10, 2010
  2. Merge branch 'maint-1.6.0' into maint-1.6.1

    * maint-1.6.0:
      base85: Make the code more obvious instead of explaining the non-obvious
      base85: encode_85() does not use the decode table
      base85 debug code: Fix length byte calculation
      checkout -m: do not try to fall back to --merge from an unborn branch
      branch: die explicitly why when calling "git branch [-a|-r] branchname".
    gitster committed Jan 10, 2010
  3. base85: Make the code more obvious instead of explaining the non-obvious

    Here is another cleanup ...
    
    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Andreas Gruenbacher committed with gitster Jan 8, 2010
  4. base85: encode_85() does not use the decode table

    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Andreas Gruenbacher committed with gitster Jan 8, 2010
  5. base85 debug code: Fix length byte calculation

    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Andreas Gruenbacher committed with gitster Jan 8, 2010
Commits on Jan 7, 2010
  1. git-rm doc: Describe how to sync index & work tree

    Newcomers to git that want to remove from the index only the
    files that have disappeared from the working tree will probably
    look for a way to do that in the documentation for 'git rm'.
    
    Therefore, describe how that can be done (even though it involves
    other commands than 'git rm'). Based on a suggestion by Junio,
    but re-arranged and rewritten to better fit into the style of
    command reference.
    
    While at it, change a single occurrence of "work tree" to "working
    tree" for consistency.
    
    Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bjorng committed with gitster Dec 7, 2009
  2. checkout -m: do not try to fall back to --merge from an unborn branch

    If switching from an unborn branch (= empty tree) to a valid commit failed
    without -m, it would fail with -m option as well.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 7, 2010