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

    Git 1.7.6.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 13, 2011
  2. @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
  3. @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
  4. @gitster

    Merge branch 'ml/mailmap' into maint-1.7.6

    * ml/mailmap:
      mailmap: xcalloc mailmap_info
    
    Conflicts:
    	mailmap.c
    gitster committed Dec 13, 2011
  5. @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 5, 2011
  1. @peff @gitster

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

    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 17, 2011
  1. @elmarco @gitster

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

    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 Oct 26, 2011
  1. @gitster

    Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6

    * mh/maint-notes-merge-pathbuf-fix:
      notes_merge_commit(): do not pass temporary buffer to other function
    gitster committed Oct 26, 2011
  2. @gitster

    Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6

    * ps/gitweb-js-with-lineno:
      gitweb: Fix links to lines in blobs when javascript-actions are enabled
    gitster committed Oct 26, 2011
  3. @gitster

    Merge branch 'jm/mergetool-pathspec' into maint-1.7.6

    * jm/mergetool-pathspec:
      mergetool: no longer need to save standard input
      mergetool: Use args as pathspec to unmerged files
    gitster committed Oct 26, 2011
  4. @gitster

    Merge branch 'mz/remote-rename' into maint-1.7.6

    * mz/remote-rename:
      remote: only update remote-tracking branch if updating refspec
      remote rename: warn when refspec was not updated
      remote: "rename o foo" should not rename ref "origin/bar"
      remote: write correct fetch spec when renaming remote 'remote'
    gitster committed Oct 26, 2011
  5. @gitster

    Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6

    * rj/maint-t9159-svn-rev-notation:
      t9159-*.sh: skip for mergeinfo test for svn <= 1.4
    gitster committed Oct 26, 2011
  6. @gitster

    Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6

    * hl/iso8601-more-zone-formats:
      date.c: Support iso8601 timezone formats
    gitster committed Oct 26, 2011
  7. @gitster

    Merge branch 'tr/doc-note-rewrite' into maint-1.7.6

    * tr/doc-note-rewrite:
      Documentation: basic configuration of notes.rewriteRef
    gitster committed Oct 26, 2011
  8. @gitster

    Merge branch 'nd/sparse-doc' into maint-1.7.6

    * nd/sparse-doc:
      git-read-tree.txt: update sparse checkout examples
    gitster committed Oct 26, 2011
  9. @gitster

    Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6

    * mg/maint-doc-sparse-checkout:
      git-read-tree.txt: correct sparse-checkout and skip-worktree description
      git-read-tree.txt: language and typography fixes
      unpack-trees: print "Aborting" to stderr
    gitster committed Oct 26, 2011
  10. @gitster

    Merge branch 'maint-1.7.5' into maint-1.7.6

    * maint-1.7.5:
      make the sample pre-commit hook script reject names with newlines, too
      Reindent closing bracket using tab instead of spaces
      Documentation/git-update-index: refer to 'ls-files'
    gitster committed Oct 26, 2011
  11. @gitster

    Merge branch 'maint-1.7.4' into maint-1.7.5

    * maint-1.7.4:
      make the sample pre-commit hook script reject names with newlines, too
      Reindent closing bracket using tab instead of spaces
      Documentation/git-update-index: refer to 'ls-files'
    gitster committed Oct 26, 2011
  12. @gitster

    Merge branch 'maint-1.7.3' into maint-1.7.4

    * maint-1.7.3:
      make the sample pre-commit hook script reject names with newlines, too
      Reindent closing bracket using tab instead of spaces
      Documentation/git-update-index: refer to 'ls-files'
    gitster committed Oct 26, 2011
  13. @gitster

    Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3

    * sn/doc-update-index-assume-unchanged:
      Documentation/git-update-index: refer to 'ls-files'
    gitster committed Oct 26, 2011
  14. @meyering @gitster

    make the sample pre-commit hook script reject names with newlines, too

    The sample pre-commit hook script would fail to reject a file name like
    "a\nb" because of the way newlines are handled in "$(...)".  Adjust the
    test to count filtered bytes and require there be 0.  Also print all
    diagnostics to standard error, not stdout, so they will actually be seen.
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster Oct 22, 2011
Commits on Oct 24, 2011
  1. @pclouds @gitster

    Reindent closing bracket using tab instead of spaces

    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 Oct 24, 2011
Commits on Sep 27, 2011
  1. @mhagger @gitster

    notes_merge_commit(): do not pass temporary buffer to other function

    It is unsafe to pass a temporary buffer as an argument to
    read_directory().
    
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Acked-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mhagger committed with gitster Sep 27, 2011
  2. @gitster

    gitweb: Fix links to lines in blobs when javascript-actions are enabled

    The fixLinks() function adds 'js=1' to each link that does not already
    have 'js' query parameter specified. This is used to signal to gitweb
    that the browser can actually do javascript when these links are used.
    
    There are two problems with the existing code:
    
      1. URIs with fragment and 'js' query parameter, like e.g.
    
            ...foo?js=0#l199
    
         were not recognized as having 'js' query parameter already.
    
      2. The 'js' query parameter, in the form of either '?js=1' or ';js=1'
         was appended at the end of URI, even if it included a fragment
         (had a hash part).  This lead to the incorrect links like this
    
            ...foo#l199?js=1
    
         instead of adding query parameter as last part of query, but
         before the fragment part, i.e.
    
            ...foo?js=1#l199
    
    Signed-off-by: Peter Stuge <peter@stuge.se>
    Acked-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Peter Stuge committed with gitster Sep 27, 2011
Commits on Sep 26, 2011
  1. @pclouds @gitster

    git-read-tree.txt: update sparse checkout examples

    The negation example uses '*' to match everything. This used to work
    before 9037026 (unpack-trees: fix sparse checkout's "unable to match
    directories") because back then, the list of paths is used to match
    sparse patterns, so with the patterns
    
        *
        !subdir/
    
    subdir/ always matches any path that start with subdir/ and "*" has no
    chance to get tested. The result is subdir is excluded.
    
    After the said commit, a tree structure is dynamically created and
    sparse pattern matching now follows closely how read_directory()
    applies .gitignore. This solves one problem, but reveals another one.
    
    With this new strategy, "!subdir/" rule will be only tested once when
    "subdir" directory is examined. Entries inside subdir, when examined,
    will match "*" and are (correctly) re-added again because any rules
    without a slash will match at every directory level. In the end, "*"
    can revert every negation rules.
    
    In order to correctly exclude subdir, we must use
    
        /*
        !subdir
    
    to limit "match all" rule at top level only.
    
    "*" rule has no actual use in sparse checkout and can be confusing to
    users. While we can automatically turn "*" to "/*", this violates
    .gitignore definition. Instead, discourage "*" in favor of "/*" (in
    the second example).
    
    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 Sep 26, 2011
  2. @gitster

    mergetool: no longer need to save standard input

    Earlier code wanted to run merge_file and prompt_after_failed_merge
    both of which wanted to read from the standard input of the entire
    script inside a while loop, which read from a pipe, and in order to
    do so, it redirected the original standard input to another file
    descriptor. We no longer need to do so after the previous change.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 16, 2011
  3. @jmah @gitster

    mergetool: Use args as pathspec to unmerged files

    Mergetool now treats its path arguments as a pathspec (like other git
    subcommands), restricting action to the given files and directories.
    Files matching the pathspec are filtered so mergetool only acts on
    unmerged paths; previously it would assume each path argument was in an
    unresolved state, and get confused when it couldn't check out their
    other stages.
    
    Running "git mergetool subdir" will prompt to resolve all conflicted
    blobs under subdir.
    
    Signed-off-by: Jonathon Mah <me@JonathonMah.com>
    Acked-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jmah committed with gitster Sep 15, 2011
Commits on Sep 23, 2011
  1. @gitster

    Git 1.7.6.4

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

    Merge branch 'cb/maint-ls-files-error-report' into maint

    * cb/maint-ls-files-error-report:
      t3005: do not assume a particular order of stdout and stderr of git-ls-files
      ls-files: fix pathspec display on error
    gitster committed Sep 23, 2011
  3. @allancaffee @gitster

    describe: Refresh the index when run with --dirty

    When running git describe --dirty the index should be refreshed.  Previously
    the cached index would cause describe to think that the index was dirty when,
    in reality, it was just stale.
    
    The issue was exposed by python setuptools which hardlinks files into another
    directory when building a distribution.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    allancaffee committed with gitster Jul 31, 2011
  4. @gitster

    Merge branch 'jc/maint-clone-alternates' into maint

    * jc/maint-clone-alternates:
      clone: clone from a repository with relative alternates
      clone: allow more than one --reference
    gitster committed Sep 23, 2011
  5. @gitster

    Merge branch 'nd/maint-clone-gitdir' into maint

    * nd/maint-clone-gitdir:
      clone: allow to clone from .git file
      read_gitfile_gently(): rename misnamed function to read_gitfile()
    gitster committed Sep 23, 2011
Something went wrong with that request. Please try again.