Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Apr 26, 2012
  1. @gitster

    Git 1.7.8.6

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Sync with 1.7.7.7

    gitster authored
  3. @gitster

    Git 1.7.7.7

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @jrn @gitster

    bundle: remove stray single-quote from error message

    jrn authored gitster committed
    After running rev-list --boundary to retrieve the list of boundary
    commits, "git bundle create" runs its own revision walk.  If in this
    stage git encounters an unfamiliar option, it writes a message with an
    unbalanced quotation mark:
    
    	error: unrecognized argument: --foo'
    
    Drop the stray quote to match the "unrecognized argument: %s" message
    used elsewhere and save translators some work.
    
    This is mostly a futureproofing measure: for now, the "rev-list
    --boundary" command catches most strange arguments on its own and the
    above message is not seen unless you try something esoteric like "git
    bundle create test.bundle --header HEAD".
    
    Reported-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 9, 2012
  1. @gitster

    Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8

    gitster authored
    * jc/maint-verify-objects-remove-pessimism:
      fetch/receive: remove over-pessimistic connectivity check
  2. @gitster

    Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8

    gitster authored
    * dw/gitweb-doc-grammo:
      Documentation/gitweb: trivial English fixes
  3. @gitster

    Merge branch 'tr/cache-tree' into maint-1.7.8

    gitster authored
    * tr/cache-tree:
      t0090: be prepared that 'wc -l' writes leading blanks
      reset: update cache-tree data when appropriate
      commit: write cache-tree data when writing index anyway
      Refactor cache_tree_update idiom from commit
      Test the current state of the cache-tree optimization
      Add test-scrap-cache-tree
  4. @gitster

    Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8

    gitster authored
    * cb/maint-t5541-make-server-port-portable:
      t5541: check error message against the real port number used
      remote-curl: Fix push status report when all branches fail
  5. @gitster

    Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8

    gitster authored
    * cn/maint-rev-list-doc:
      Documentation: use {asterisk} in rev-list-options.txt when needed
  6. @gitster

    Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8

    gitster authored
    * tr/maint-bundle-boundary:
      bundle: keep around names passed to add_pending_object()
      t5510: ensure we stay in the toplevel test dir
      t5510: refactor bundle->pack conversion
  7. @gitster

    Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8

    gitster authored
    * tr/maint-bundle-long-subject:
      t5704: match tests to modern style
      strbuf: improve strbuf_get*line documentation
      bundle: use a strbuf to scan the log for boundary commits
      bundle: put strbuf_readline_fd in strbuf.c with adjustments
  8. @gitster

    Merge branch 'ph/rerere-doc' into maint-1.7.8

    gitster authored
    * ph/rerere-doc:
      rerere: Document 'rerere remaining'
Commits on Mar 23, 2012
  1. @gitster

    Documentation/gitweb: trivial English fixes

    D Waitzman authored gitster committed
    Change "it's" to "its" where a possessive is intended.  Also add two
    missing "the" that were noticed by Ben Walton.
    
    Signed-off-by: David Waitzman <djw@bbn.com>
Commits on Mar 20, 2012
  1. @gitster

    Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8

    gitster authored
    * ks/sort-wildcard-in-makefile:
      t/Makefile: Use $(sort ...) explicitly where needed
  2. @gitster

    Merge branch 'jc/advise-i18n' into maint-1.7.8

    gitster authored
    * jc/advise-i18n:
      i18n of multi-line advice messages
  3. @gitster

    Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8

    gitster authored
    * jn/gitweb-unspecified-action:
      gitweb: Fix actionless dispatch for non-existent objects
Commits on Mar 15, 2012
  1. @gitster

    fetch/receive: remove over-pessimistic connectivity check

    gitster authored
    Git 1.7.8 introduced an object and history re-validation step after
    "fetch" or "push" causes new history to be added to a receiving
    repository. This is to protect a malicious server or pushing client from
    corrupting the repository by taking advantage of an existing corrupt
    object that is unconnected to existing history.
    
    But this check is way over-pessimistic.  During "fetch" or "receive-pack"
    (the server side of "push"), unpack-objects and index-pack already
    validate individual objects that are received, and the only thing we would
    want to catch are corrupted objects that already happen to exist in our
    repository but are not referenced from our refs.  Such objects must have
    been written by an earlier run of our codepaths that write out loose
    objects or packfiles, and they must have done the validation of individual
    objects when they did so.  The only thing left to worry about is the
    connectivity integrity, which can be checked with "rev-list --objects",
    which is much cheaper.  We have been paying the 5x to 8x runtime overhead
    the --verify-objects often adds for no real gain.
    
    Revert check_everything_connected() not to use this over-pessimistic
    check.
    
    Credit goes to Nguyễn Thái Ngọc Duy, who originally identified the
    performance regression and endured multiple rounds of reviews to fix it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 8, 2012
  1. @phord @gitster

    rerere: Document 'rerere remaining'

    phord authored gitster committed
    This adds the 'remaining' command to the documentation of
    'git rerere'. This command was added in ac49f5c (Feb 16 2011;
    Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>) but
    it was never documented.
    
    Touch up the other rerere commands to reduce noise.
    
    First noticed by Vincent van Ravesteijn.
    
    Signed-off-by: Phil Hord <phil.hord@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 6, 2012
  1. @gitster

    Merge branch 'maint-1.7.7' into maint-1.7.8

    gitster authored
    By Thomas Rast
    * maint-1.7.7:
      Document the --histogram diff option
  2. @trast @gitster

    Document the --histogram diff option

    trast authored gitster committed
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 1, 2012
  1. @trast @gitster

    bundle: keep around names passed to add_pending_object()

    trast authored gitster committed
    The 'name' field passed to add_pending_object() is used to later
    deduplicate in object_array_remove_duplicates().
    
    git-bundle had a bug in this area since 18449ab (git-bundle: avoid
    packing objects which are in the prerequisites, 2007-03-08): it passed
    the name of each boundary object in a static buffer.  In other words,
    all that object_array_remove_duplicates() saw was the name of the
    *last* added boundary object.
    
    The recent switch to a strbuf in bc2fed4 (bundle: use a strbuf to scan
    the log for boundary commits, 2012-02-22) made this slightly worse: we
    now free the buffer at the end, so it is not even guaranteed that it
    still points into addressable memory by the time object_array_remove_
    duplicates looks at it.  On the plus side however, it was now
    detectable by valgrind.
    
    The fix is easy: pass a copy of the string to add_pending_object.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @trast @gitster

    t5510: ensure we stay in the toplevel test dir

    trast authored gitster committed
    The last test descended into a subdir without ever re-emerging, which
    is not so nice to the next test writer.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @trast @gitster

    t5510: refactor bundle->pack conversion

    trast authored gitster committed
    It's not so much a conversion as a "strip everything up to and
    including the first blank line", but it will come in handy again.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 28, 2012
  1. @carlosmn @gitster

    Documentation: use {asterisk} in rev-list-options.txt when needed

    carlosmn authored gitster committed
    Text between two '*' is emphasized in AsciiDoc and makes explanations in
    rev-list-options.txt on glob-related options very confusing, as the
    rendered text would be missing two asterisks and the text between them
    would be emphasized instead.
    
    Use '{asterisk}' where needed to make them show up as asterisks in the
    rendered text.
    
    Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 27, 2012
  1. @gitster

    Git 1.7.8.5

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    grep -P: Fix matching ^ and $

    Michał Kiedrowicz authored gitster committed
    When "git grep" is run with -P/--perl-regexp, it doesn't match ^ and $ at
    the beginning/end of the line.  This is because PCRE normally matches ^
    and $ at the beginning/end of the whole text, not for each line, and "git
    grep" passes a large chunk of text (possibly containing many lines) to
    pcre_exec() and then splits the text into lines.
    
    This makes "git grep -P" behave differently from "git grep -E" and also
    from "grep -P" and "pcregrep":
    
    	$ cat file
    	a
    	 b
    	$ git grep --no-index -P '^ ' file
    	$ git grep --no-index -E '^ ' file
    	file: b
    	$ grep -c -P '^ ' file
    	 b
    	$ pcregrep -c '^ ' file
    	 b
    
    Reported-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
    Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @meyering @gitster

    am: don't infloop for an empty input file

    meyering authored gitster committed
    git-am.sh's check_patch_format function would attempt to preview
    the patch to guess its format, but would go into an infinite loop
    when the patch file happened to be empty.  The solution: exit the
    loop when "read" fails, not when the line var, "$l1" becomes empty.
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @andrewkww @gitster

    rebase -m: only call "notes copy" when rewritten exists and is non-empty

    andrewkww authored gitster committed
    This prevents a shell error complaining rebase-merge/rewritten doesn't exist.
    
    Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 26, 2012
  1. @gitster

    Makefile: add thread-utils.h to LIB_H

    Dmitry V. Levin authored gitster committed
    Starting with commit v1.7.8-165-g0579f91, grep.h includes
    thread-utils.h, so the latter has to be added to LIB_H.
    
    Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
    Acked-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 23, 2012
  1. @trast @gitster

    t5704: match tests to modern style

    trast authored gitster committed
    The test did not adhere to the current style on several counts:
    
     . empty lines around the test blocks, but within the test string
     . ': > file' or even just '> file' with an extra space
     . inconsistent indentation
     . hand-rolled commits instead of using test_commit
    
    Fix all of them.
    
    There's a catch to the last point: test_commit creates a tag, which the
    original test did not create.  We still change it to test_commit, and
    explicitly delete the tags, so as to highlight that the test relies on not
    having them.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @trast @gitster

    strbuf: improve strbuf_get*line documentation

    trast authored gitster committed
    Clarify strbuf_getline() documentation, and add the missing documentation
    for strbuf_getwholeline() and strbuf_getwholeline_fd().
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @trast @gitster

    bundle: use a strbuf to scan the log for boundary commits

    trast authored gitster committed
    The first part of the bundle header contains the boundary commits, and
    could be approximated by
    
      # v2 git bundle
      $(git rev-list --pretty=oneline --boundary <ARGS> | grep ^-)
    
    git-bundle actually spawns exactly this rev-list invocation, and does
    the grepping internally.
    
    There was a subtle bug in the latter step: it used fgets() with a
    1024-byte buffer.  If the user has sufficiently long subjects (e.g.,
    by not adhering to the git oneline-subject convention in the first
    place), the 'oneline' format can easily overflow the buffer.  fgets()
    then returns the rest of the line in the next call(s).  If one of
    these remaining parts started with '-', git-bundle would mistakenly
    insert it into the bundle thinking it was a boundary commit.
    
    Fix it by using strbuf_getwholeline() instead, which handles arbitrary
    line lengths correctly.
    
    Note that on the receiving side in parse_bundle_header() we were
    already using strbuf_getwholeline_fd(), so that part is safe.
    
    Reported-by: Jannis Pohlmann <jannis.pohlmann@codethink.co.uk>
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @trast @gitster

    bundle: put strbuf_readline_fd in strbuf.c with adjustments

    trast authored gitster committed
    The comment even said that it should eventually go there.  While at
    it, match the calling convention and name of the function to the
    strbuf_get*line family.  So it now is strbuf_getwholeline_fd.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 13, 2012
  1. @drizzd @gitster

    t5541: check error message against the real port number used

    drizzd authored gitster committed
    Otherwise the test cannot be run with custom port set to LIB_HTTPD_PORT.
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 6, 2012
  1. @gitster

    Sync with 1.7.6.6

    gitster authored
    * maint-1.7.7:
      Git 1.7.6.6
      imap-send: remove dead code
Something went wrong with that request. Please try again.