Skip to content
Commits on Dec 21, 2011
  1. @gitster

    Git 1.7.8.1

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

    Merge branch 'jl/submodule-status-failure-report' into maint

    * jl/submodule-status-failure-report:
      diff/status: print submodule path when looking for changes fails
    gitster committed Dec 21, 2011
  3. @gitster

    Merge branch 'tr/userdiff-c-returns-pointer' into maint

    * tr/userdiff-c-returns-pointer:
      userdiff: allow * between cpp funcname words
    gitster committed Dec 21, 2011
  4. @gitster

    Merge branch 'bc/maint-apply-check-no-patch' into maint

    * bc/maint-apply-check-no-patch:
      builtin/apply.c: report error on failure to recognize input
      t/t4131-apply-fake-ancestor.sh: fix broken test
    gitster committed Dec 21, 2011
  5. @gitster

    Merge branch 'cn/maint-lf-to-crlf-filter' into maint

    * cn/maint-lf-to-crlf-filter:
      lf_to_crlf_filter(): tell the caller we added "\n" when draining
      convert: track state in LF-to-CRLF filter
    gitster committed Dec 21, 2011
  6. @gitster

    Merge branch 'jk/maint-upload-archive' into maint

    * jk/maint-upload-archive:
      archive: don't let remote clients get unreachable commits
    gitster committed Dec 21, 2011
  7. @carlosmn @gitster

    clone: the -o option has nothing to do with <branch>

    It is to give an alternate <name> instead of "origin" to the remote
    we are cloning from.
    
    Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    carlosmn committed with gitster Dec 21, 2011
  8. @gitster

    builtin/log: remove redundant initialization

    "abbrev" and "commit_format" in struct rev_info get initialized in
    init_revisions - no need to reinit in cmd_log_init_defaults.
    
    Signed-off-by: Michael Schubert <mschub@elegosoft.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Michael Schubert committed with gitster Dec 21, 2011
  9. @gitster

    Merge branch 'ms/commit-cc-option-helpstring' into maint

    * ms/commit-cc-option-helpstring:
      builtin/commit: add missing '/' in help message
    gitster committed Dec 21, 2011
  10. @gitster

    builtin/commit: add missing '/' in help message

    Signed-off-by: Michael Schubert <mschub@elegosoft.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Michael Schubert committed with gitster Dec 21, 2011
  11. @avar @gitster

    builtin/init-db.c: eliminate -Wformat warning on Solaris

    On Solaris systems we'd warn about an implicit cast of mode_t when we
    printed things out with the %d format. We'd get this warning under GCC
    4.6.0 with Solaris headers:
    
        builtin/init-db.c: In function ‘separate_git_dir’:
        builtin/init-db.c:354:4: warning: format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘mode_t’ [-Wformat]
    
    We've been doing this ever since v1.7.4.1-296-gb57fb80. Just work
    around this by adding an explicit cast.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    avar committed with gitster Dec 20, 2011
Commits on Dec 16, 2011
  1. @gitster

    lf_to_crlf_filter(): tell the caller we added "\n" when draining

    This can only happen when the input size is multiple of the
    buffer size of the cascade filter (16k) and ends with an LF,
    but in such a case, the code forgot to tell the caller that
    it added the "\n" it could not add during the last round.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 16, 2011
Commits on Dec 14, 2011
  1. @gitster

    Update draft release notes for 1.7.8.1

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

    Merge branch 'jc/maint-pack-object-cycle' into maint

    * jc/maint-pack-object-cycle:
      pack-object: tolerate broken packs that have duplicated objects
    
    Conflicts:
    	builtin/pack-objects.c
    gitster committed Dec 13, 2011
  3. @gitster

    Merge branch 'jc/index-pack-reject-dups' into maint

    * jc/index-pack-reject-dups:
      receive-pack, fetch-pack: reject bogus pack that records objects twice
    gitster committed Dec 13, 2011
  4. @gitster

    Merge branch 'mf/curl-select-fdset' into maint

    * mf/curl-select-fdset:
      http: drop "local" member from request struct
      http.c: Rely on select instead of tracking whether data was received
      http.c: Use timeout suggested by curl instead of fixed 50ms timeout
      http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping
    gitster committed Dec 13, 2011
  5. @gitster

    Merge branch 'nd/misc-cleanups' into maint

    * nd/misc-cleanups:
      unpack_object_header_buffer(): clear the size field upon error
      tree_entry_interesting: make use of local pointer "item"
      tree_entry_interesting(): give meaningful names to return values
      read_directory_recursive: reduce one indentation level
      get_tree_entry(): do not call find_tree_entry() on an empty tree
      tree-walk.c: do not leak internal structure in tree_entry_len()
    gitster committed Dec 13, 2011
  6. @gitster

    Merge branch 'maint-1.7.7' into maint

    * maint-1.7.7:
      Git 1.7.7.5
      Git 1.7.6.5
      blame: don't overflow time buffer
      fetch: create status table using strbuf
      checkout,merge: loosen overwriting untracked file check based on info/exclude
      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
    
    Conflicts:
    	Documentation/git.txt
    	GIT-VERSION-GEN
    	RelNotes
    	builtin/fetch.c
    gitster committed Dec 13, 2011
  7. @gitster

    Git 1.7.7.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 13, 2011
  8. @gitster

    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 13, 2011
  9. @gitster

    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 13, 2011
  10. @gitster

    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 13, 2011
  11. @gitster

    Git 1.7.6.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 13, 2011
  12. @gitster

    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 13, 2011
  13. @gitster

    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 13, 2011
  14. @gitster

    Merge branch 'ml/mailmap' into maint-1.7.6

    * ml/mailmap:
      mailmap: xcalloc mailmap_info
    
    Conflicts:
    	mailmap.c
    gitster committed Dec 13, 2011
  15. @peff @gitster

    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. @peff @gitster

    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. @gitster

    Merge branch 'maint-1.7.7' into maint

    * maint-1.7.7:
      am: don't persist keepcr flag
      mingw: give waitpid the correct signature
      git symbolic-ref: documentation fix
    gitster committed Dec 9, 2011
  2. @gitster

    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 8, 2011
  3. @kusma @gitster

    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. @jlehmann @gitster

    diff/status: print submodule path when looking for changes fails

    diff and status run "git status --porcelain" inside each populated
    submodule to see if it contains changes (unless told not to do so via
    config or command line option). When that fails, e.g. due to a corrupt
    submodule .git directory, it just prints "git status --porcelain failed"
    or "Could not run git status --porcelain" without giving the user a clue
    where that happened.
    
    Add '"in submodule %s", path' to these error strings to tell the user
    where exactly the problem occurred.
    
    Reported-by: Seth Robertson <in-gitvger@baka.org>
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jlehmann committed with gitster Dec 7, 2011
  2. @mhagger @gitster

    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 6, 2011
  1. @trast @gitster

    userdiff: allow * between cpp funcname words

    The cpp pattern, used for C and C++, would not match the start of a
    declaration such as
    
      static char *prepare_index(int argc,
    
    because it did not allow for * anywhere between the various words that
    constitute the modifiers, type and function name.  Fix it.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Dec 6, 2011
Commits on Dec 5, 2011
  1. @gitster

    Merge branch 'maint-1.7.7' into maint

    * maint-1.7.7:
      stripspace: fix outdated comment
      Add MYMETA.yml to perl/.gitignore
    gitster committed Dec 5, 2011
Something went wrong with that request. Please try again.