Permalink
Commits on Dec 14, 2011
  1. Git 1.7.7.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 14, 2011
  2. Merge branch 'ab/clang-lints' into maint-1.7.7

    * ab/clang-lints:
      cast variable in call to free() in builtin/diff.c and submodule.c
      apply: get rid of useless x < 0 comparison on a size_t type
    gitster committed Dec 14, 2011
  3. Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7

    * nd/maint-ignore-exclude:
      checkout,merge: loosen overwriting untracked file check based on info/exclude
    gitster committed Dec 14, 2011
  4. Merge branch 'maint-1.7.6' into maint-1.7.7

    * maint-1.7.6:
      Git 1.7.6.5
      blame: don't overflow time buffer
      fetch: create status table using strbuf
    
    Conflicts:
    	Documentation/git.txt
    	GIT-VERSION-GEN
    	RelNotes
    gitster committed Dec 14, 2011
  5. Git 1.7.6.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 14, 2011
  6. Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6

    * jk/maint-fetch-status-table:
      fetch: create status table using strbuf
    gitster committed Dec 14, 2011
  7. Merge branch 'jc/maint-name-rev-all' into maint-1.7.6

    * jc/maint-name-rev-all:
      name-rev --all: do not even attempt to describe non-commit object
    gitster committed Dec 14, 2011
  8. Merge branch 'ml/mailmap' into maint-1.7.6

    * ml/mailmap:
      mailmap: xcalloc mailmap_info
    
    Conflicts:
    	mailmap.c
    gitster committed Dec 14, 2011
  9. blame: don't overflow time buffer

    When showing the raw timestamp, we format the numeric
    seconds-since-epoch into a buffer, followed by the timezone
    string. This string has come straight from the commit
    object. A well-formed object should have a timezone string
    of only a few bytes, but we could be operating on data
    pushed by a malicious user.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Dec 8, 2011
Commits on Dec 10, 2011
  1. fetch: create status table using strbuf

    When we fetch from a remote, we print a status table like:
    
      From url
       * [new branch]   foo -> origin/foo
    
    We create this table in a static buffer using sprintf. If
    the remote refnames are long, they can overflow this buffer
    and smash the stack.
    
    Instead, let's use a strbuf to build the string.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Dec 8, 2011
Commits on Dec 9, 2011
  1. am: don't persist keepcr flag

    The keepcr flag is only used in the split_patches function, which is
    only called before a patch application has to stopped for user input,
    not after resuming. It is therefore unnecessary to persist the
    flag. This seems to have been the case since it was introduced in
    ad2c928 (git-am: Add command line parameter `--keep-cr` passing it to
    git-mailsplit, 2010-02-27).
    
    Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Martin von Zweigbergk committed with gitster Dec 9, 2011
  2. mingw: give waitpid the correct signature

    POSIX says that last parameter to waitpid should be 'int',
    so let's make it so.
    
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    kusma committed with gitster Dec 8, 2011
Commits on Dec 8, 2011
  1. git symbolic-ref: documentation fix

    The old "git symbolic-ref" manpage seemed to imply in one place that
    symlinks are still the default way to represent symbolic references
    and in another that symlinks are deprecated.  Fix the text and shorten
    the justification for the change of implementation.
    
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mhagger committed with gitster Dec 7, 2011
Commits on Dec 5, 2011
  1. Merge branch 'maint-1.7.6' into maint-1.7.7

    * maint-1.7.6:
      stripspace: fix outdated comment
      Add MYMETA.yml to perl/.gitignore
    gitster committed Dec 5, 2011
  2. stripspace: fix outdated comment

    The comment on top of stripspace() claims that the buffer
    will no longer be NUL-terminated. However, this has not been
    the case at least since the move to using strbuf in 2007.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Dec 5, 2011
  3. Add MYMETA.yml to perl/.gitignore

    This file is auto-generated by newer versions of ExtUtils::MakeMaker
    (presumably starting with the version shipping with Perl 5.14). It just
    contains extra information about the environment and arguments to the
    Makefile-building process, and should be ignored.
    
    Signed-off-by: Sebastian Morr <sebastian@morr.cc>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    blinry committed with gitster Dec 2, 2011
Commits on Nov 28, 2011
  1. checkout,merge: loosen overwriting untracked file check based on info…

    …/exclude
    
    Back in 1127148 (Loosen "working file will be lost" check in
    Porcelain-ish - 2006-12-04), git-checkout.sh learned to quietly
    overwrite ignored files. Howver the code only took .gitignore files
    into account.
    
    Standard ignored files include all specified in .gitignore files in
    working directory _and_ $GIT_DIR/info/exclude. This patch makes sure
    ignored files in info/exclude can also be overwritten automatically in
    the spirit of the original patch.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pclouds committed with gitster Nov 27, 2011
Commits on Nov 21, 2011
  1. documentation fix: git difftool uses diff tools, not merge tools.

    Let the documentation for -t list valid *diff* tools,
    not valid *merge* tools.
    
    Signed-off-by: Thomas Hochstein <thh@inter.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    th-h committed with gitster Nov 14, 2011
Commits on Nov 18, 2011
  1. Git 1.7.7.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 18, 2011
  2. Merge branch 'jc/maint-name-rev-all' into maint

    * jc/maint-name-rev-all:
      name-rev --all: do not even attempt to describe non-commit object
    gitster committed Nov 18, 2011
  3. Merge branch 'ml/mailmap' into maint

    * ml/mailmap:
      mailmap: xcalloc mailmap_info
    
    Conflicts:
    	mailmap.c
    gitster committed Nov 18, 2011
  4. Merge branch 'jn/maint-notes-avoid-va-args' into maint

    * jn/maint-notes-avoid-va-args:
      notes merge: eliminate OUTPUT macro
    
    Conflicts:
    	notes-merge.c
    gitster committed Nov 18, 2011
  5. Makefile: add missing header file dependencies

    When the streaming filter API was introduced in v1.7.7-rc0~60^2~7
    (2011-05-20), we forgot to add its header to LIB_H.  Most translation
    units depend on streaming.h via cache.h.
    
    v1.7.5-rc0~48 (Fix sparse warnings, 2011-03-22) introduced undeclared
    dependencies by url.o on url.h and thread-utils.o on thread-utils.h.
    
    Noticed by make CHECK_HEADER_DEPENDENCIES=1.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Nov 18, 2011
  6. notes merge: eliminate OUTPUT macro

    The macro is variadic, which breaks support for pre-C99 compilers,
    and it hides an "if", which can make code hard to understand on
    first reading if some arguments have side-effects.
    
    The OUTPUT macro seems to have been inspired by the "output" function
    from merge-recursive.  But that function in merge-recursive exists to
    indent output based on the level of recursion and there is no similar
    justification for such a function in "notes merge".
    
    Noticed with 'make CC="gcc -std=c89 -pedantic"':
    
     notes-merge.c:24:22: warning: anonymous variadic macros were introduced in C99 [-Wvariadic-macros]
    
    Encouraged-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    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 Nov 18, 2011
Commits on Nov 17, 2011
  1. mailmap: xcalloc mailmap_info

    This is to avoid reaching free of uninitialized members.
    
    With an invalid .mailmap (and perhaps in other cases), it can reach
    free(mi->name) with garbage for example.
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    elmarco committed with gitster Nov 17, 2011
Commits on Nov 15, 2011
  1. name-rev --all: do not even attempt to describe non-commit object

    This even dates back to the very beginning of "git name-rev";
    it does not make much sense to dump all objects in the repository
    and label non-commits as "undefined".
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 15, 2011
Commits on Nov 9, 2011
  1. Git 1.7.7.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 9, 2011
  2. Merge branch 'jc/maint-remove-renamed-ref' into maint

    * jc/maint-remove-renamed-ref:
      branch -m/-M: remove undocumented RENAMED-REF
    
    Conflicts:
    	refs.c
    gitster committed Nov 9, 2011
  3. Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint

    * jm/maint-gitweb-filter-forks-fix:
      gitweb: fix regression when filtering out forks
    gitster committed Nov 9, 2011
  4. Merge branch 'dm/pack-objects-update' into maint

    * dm/pack-objects-update:
      pack-objects: don't traverse objects unnecessarily
      pack-objects: rewrite add_descendants_to_write_order() iteratively
      pack-objects: use unsigned int for counter and offset values
      pack-objects: mark add_to_write_order() as inline
    gitster committed Nov 9, 2011
Commits on Nov 8, 2011
  1. docs: Update install-doc-quick

    The preformatted documentation pages live in their own repositories
    these days. Adjust the installation procedure to the updated layout.
    
    Tested-by: Stefan Naewe <stefan.naewe@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 8, 2011
  2. docs: don't mention --quiet or --exit-code in git-log(1)

    These are diff-options, but they don't actually make sense
    in the context of log.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Nov 8, 2011
Commits on Nov 6, 2011
  1. cast variable in call to free() in builtin/diff.c and submodule.c

    Both of these free() calls are freeing a "const unsigned char (*)[20]"
    type while free() expects a "void *". This results in the following
    warning under clang 2.9:
    
        builtin/diff.c:185:7: warning: passing 'const unsigned char (*)[20]' to parameter of type 'void *' discards qualifiers
                free(parent);
                     ^~~~~~
    
        submodule.c:394:7: warning: passing 'const unsigned char (*)[20]' to parameter of type 'void *' discards qualifiers
                free(parents);
                     ^~~~~~~
    
    This free()-ing without a cast was added by Jim Meyering to
    builtin/diff.c in v1.7.6-rc3~4 and later by Fredrik Gustafsson in
    submodule.c in v1.7.7-rc1~25^2.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    avar committed with gitster Nov 6, 2011
  2. apply: get rid of useless x < 0 comparison on a size_t type

    According to the C standard size_t is always unsigned, therefore the
    comparison "n1 < 0 || n2 < 0" when n1 and n2 are size_t will always be
    false.
    
    This was raised by clang 2.9 which throws this warning when compiling
    apply.c:
    
        builtin/apply.c:253:9: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare]
                if (n1 < 0 || n2 < 0)
                    ~~ ^ ~
        builtin/apply.c:253:19: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare]
                if (n1 < 0 || n2 < 0)
                              ~~ ^ ~
    
    This check was originally added in v1.6.5-rc0~53^2 by Giuseppe Bilotta
    while adding an option to git-apply to ignore whitespace differences.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    avar committed with gitster Nov 6, 2011
Commits on Nov 1, 2011
  1. Git 1.7.7.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 1, 2011