Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v1.7.9-rc1
Commits on Jan 13, 2012
  1. Git 1.7.9-rc1

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/request-pull-show-head-4'

    authored
    * jc/request-pull-show-head-4:
      request-pull: use the real fork point when preparing the message
  3. Merge branch 'tr/maint-mailinfo'

    authored
    * tr/maint-mailinfo:
      mailinfo documentation: accurately describe non -k case
  4. Merge branch 'ss/maint-msys-cvsexportcommit'

    authored
    * ss/maint-msys-cvsexportcommit:
      git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS
      t9200: On MSYS, do not pass Windows-style paths to CVS
  5. Merge branch 'jk/maint-upload-archive'

    authored
    * jk/maint-upload-archive:
      archive: re-allow HEAD:Documentation on a remote invocation
  6. Merge branch 'maint'

    authored
    * maint:
      Update draft release notes to 1.7.8.4
      Update draft release notes to 1.7.7.6
      Update draft release notes to 1.7.6.6
      thin-pack: try harder to use preferred base objects as base
  7. Update draft release notes to 1.7.8.4

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Merge branch 'maint-1.7.7' into maint

    authored
    * maint-1.7.7:
      Update draft release notes to 1.7.7.6
      Update draft release notes to 1.7.6.6
      thin-pack: try harder to use preferred base objects as base
  9. Update draft release notes to 1.7.7.6

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. Merge branch 'maint-1.7.6' into maint-1.7.7

    authored
    * maint-1.7.6:
      Update draft release notes to 1.7.6.6
      thin-pack: try harder to use preferred base objects as base
  11. Update draft release notes to 1.7.6.6

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

    thin-pack: try harder to use preferred base objects as base

    peff authored committed
    When creating a pack using objects that reside in existing packs, we try
    to avoid recomputing futile delta between an object (trg) and a candidate
    for its base object (src) if they are stored in the same packfile, and trg
    is not recorded as a delta already. This heuristics makes sense because it
    is likely that we tried to express trg as a delta based on src but it did
    not produce a good delta when we created the existing pack.
    
    As the pack heuristics prefer producing delta to remove data, and Linus's
    law dictates that the size of a file grows over time, we tend to record
    the newest version of the file as inflated, and older ones as delta
    against it.
    
    When creating a thin-pack to transfer recent history, it is likely that we
    will try to send an object that is recorded in full, as it is newer.  But
    the heuristics to avoid recomputing futile delta effectively forbids us
    from attempting to express such an object as a delta based on another
    object. Sending an object in full is often more expensive than sending a
    suboptimal delta based on other objects, and it is even more so if we
    could use an object we know the receiving end already has (i.e. preferred
    base object) as the delta base.
    
    Tweak the recomputation avoidance logic, so that we do not punt on
    computing delta against a preferred base object.
    
    The effect of this change can be seen on two simulated upload-pack
    workloads. The first is based on 44 reflog entries from my git.git
    origin/master reflog, and represents the packs that kernel.org sent me git
    updates for the past month or two. The second workload represents much
    larger fetches, going from git's v1.0.0 tag to v1.1.0, then v1.1.0 to
    v1.2.0, and so on.
    
    The table below shows the average generated pack size and the average CPU
    time consumed for each dataset, both before and after the patch:
    
                      dataset
                | reflog | tags
    ---------------------------------
         before | 53358  | 2750977
    size  after | 32398  | 2668479
         change |   -39% |      -3%
    ---------------------------------
         before |  0.18  | 1.12
    CPU   after |  0.18  | 1.15
         change |    +0% |      +3%
    
    This patch makes a much bigger difference for packs with a shorter slice
    of history (since its effect is seen at the boundaries of the pack) though
    it has some benefit even for larger packs.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Acked-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 12, 2012
  1. @carlosmn

    archive: re-allow HEAD:Documentation on a remote invocation

    carlosmn authored committed
    The tightening done in (ee27ca4: archive: don't let remote clients
    get unreachable commits, 2011-11-17) went too far and disallowed
    HEAD:Documentation as it would try to find "HEAD:Documentation" as a
    ref.
    
    Only DWIM the "HEAD" part to see if it exists as a ref. Once we're
    sure that we've been given a valid ref, we follow the normal code
    path. This still disallows attempts to access commits which are not
    branch tips.
    
    Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint'

    authored
    * maint:
      attr: fix leak in free_attr_elem
      t2203: fix wrong commit command
  3. Merge branch 'maint-1.7.7' into maint

    authored
    * maint-1.7.7:
      attr: fix leak in free_attr_elem
      t2203: fix wrong commit command
  4. Merge branch 'maint-1.7.6' into maint-1.7.7

    authored
    * maint-1.7.6:
      attr: fix leak in free_attr_elem
      t2203: fix wrong commit command
  5. @peff

    attr: fix leak in free_attr_elem

    peff authored committed
    This function frees the individual "struct match_attr"s we
    have allocated, but forgot to free the array holding their
    pointers, leading to a minor memory leak (but it can add up
    after checking attributes for paths in many directories).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @sschuberth

    git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS

    sschuberth authored committed
    Due to MSYS path mangling GIT_DIR contains a Windows-style path when
    checked inside a Perl script even if GIT_DIR was previously set to an
    MSYS-style path in a shell script. So explicitly convert to an MSYS-style
    path before calling Perl's rel2abs() to make it work.
    
    This fix was inspired by a very similar patch in WebKit:
    
    http://trac.webkit.org/changeset/76255/trunk/Tools/Scripts/commit-log-editor
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Tested-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @sschuberth

    t9200: On MSYS, do not pass Windows-style paths to CVS

    sschuberth authored committed
    For details, see the commit message of 4114156. Note that while using
    $PWD as part of GIT_DIR is not required here, it does no harm and it is
    more consistent. In addition, on MSYS using an environment variable should
    be slightly faster than spawning an external executable.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @trast

    mailinfo documentation: accurately describe non -k case

    trast authored committed
    Since its very first description of -k, the documentation for
    git-mailinfo claimed that (in the case without -k) after cleaning up
    bracketed strings [blah], it would insert [PATCH].
    
    It doesn't; on the contrary, one of the important jobs of mailinfo is
    to remove those strings.
    
    Since we're already there, rewrite the paragraph to give a complete
    enumeration of all the transformations.  Specifically, it was missing
    the whitespace normalization (run of isspace(c) -> ' ') and the
    removal of leading ':'.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 11, 2012
  1. @pclouds

    t2203: fix wrong commit command

    pclouds authored committed
    Add commit message to avoid commit's aborting due to the lack of
    commit message, not because there are INTENT_TO_ADD entries in index.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. request-pull: use the real fork point when preparing the message

    authored
    The command takes the "start" argument and computes the merge base
    between it and the commit to be pulled so that we can show the diffstat,
    but uses the "start" argument as-is when composing the message
    
        The following changes since commit $X are available
    
    to tell the integrator which commit the work is based on. Giving "origin"
    (most of the time it resolves to refs/remotes/origin/master) as the start
    argument is often convenient, but it is usually not the fork point, and
    does not help the integrator at all.
    
    Use the real fork point, which is the merge base we already compute, when
    composing that part of the message.
    
    Suggested-by: Linus Torvalds
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 10, 2012
  1. Merge branch 'bw/maint-t8006-sed-incomplete-line'

    authored
    * bw/maint-t8006-sed-incomplete-line:
      Use perl instead of sed for t8006-blame-textconv test
  2. Sync with maint

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Prepare for 1.7.8.4

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge the attributes fix in from maint-1.6.7 branch

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Prepare for 1.7.7.6

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Merge the attributes fix in from maint-1.6.6 branch

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Prepare for 1.7.6.6

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Documentation: rerere's rr-cache auto-creation and rerere.enabled

    authored
    The description of rerere.enabled left the user in the dark as to who
    might create an rr-cache directory.  Add a note that simply invoking
    rerere does this.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. attr.c: clarify the logic to pop attr_stack

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. attr.c: make bootstrap_attr_stack() leave early

    authored
    Thas would de-dent the body of a function that has grown rather large over
    time, making it a bit easier to read.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @peff

    attr: drop misguided defensive coding

    peff authored committed
    In prepare_attr_stack, we pop the old elements of the stack
    (which were left from a previous lookup and may or may not
    be useful to us). Our loop to do so checks that we never
    reach the top of the stack. However, the code immediately
    afterwards will segfault if we did actually reach the top of
    the stack.
    
    Fortunately, this is not an actual bug, since we will never
    pop all of the stack elements (we will always keep the root
    gitattributes, as well as the builtin ones). So the extra
    check in the loop condition simply clutters the code and
    makes the intent less clear. Let's get rid of it.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @peff

    attr: don't confuse prefixes with leading directories

    peff authored committed
    When we prepare the attribute stack for a lookup on a path,
    we start with the cached stack from the previous lookup
    (because it is common to do several lookups in the same
    directory hierarchy). So the first thing we must do in
    preparing the stack is to pop any entries that point to
    directories we are no longer interested in.
    
    For example, if our stack contains gitattributes for:
    
      foo/bar/baz
      foo/bar
      foo
    
    but we want to do a lookup in "foo/bar/bleep", then we want
    to pop the top element, but retain the others.
    
    To do this we walk down the stack from the top, popping
    elements that do not match our lookup directory. However,
    the test do this simply checked strncmp, meaning we would
    mistake "foo/bar/baz" as a leading directory of
    "foo/bar/baz_plus". We must also check that the character
    after our match is '/', meaning we matched the whole path
    component.
    
    There are two special cases to consider:
    
      1. The top of our attr stack has the empty path. So we
         must not check for '/', but rather special-case the
         empty path, which always matches.
    
      2. Typically when matching paths in this way, you would
         also need to check for a full string match (i.e., the
         character after is '\0'). We don't need to do so in
         this case, though, because our path string is actually
         just the directory component of the path to a file
         (i.e., we know that it terminates with "/", because the
         filename comes after that).
    
    Helped-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. Use perl instead of sed for t8006-blame-textconv test

    Ben Walton authored committed
    In test 'blame --textconv with local changes' of t8006-blame-textconv,
    using /usr/xpg4/bin/sed (as set by SANE_TOOL_PATH), an additional
    newline was added to the output from the 'helper' script.
    
    This was noted by sed with a message such as:
    sed: Missing newline at end of file zero.bin.
    
    Sed then exits with status 2 causing the helper script to also exit
    with status 2.
    
    In turn, this was triggering a fatal error from git blame:
    fatal: unable to read files to diff
    
    To work around this difference in sed behaviour, use perl -p instead
    of sed -e as it exits cleanly and does not insert the additional
    newline.
    
    Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.