Permalink
Switch branches/tags
Commits on Feb 27, 2012
  1. Git 1.7.8.5

    gitster committed Feb 27, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. grep -P: Fix matching ^ and $

    mkiedrowicz committed with gitster Feb 25, 2012
    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. am: don't infloop for an empty input file

    meyering committed with gitster Feb 25, 2012
    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. rebase -m: only call "notes copy" when rewritten exists and is non-empty

    andrewkww committed with gitster Feb 25, 2012
    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. Makefile: add thread-utils.h to LIB_H

    ldv-alt committed with gitster Feb 24, 2012
    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 6, 2012
  1. Sync with 1.7.6.6

    gitster committed Feb 6, 2012
    * maint-1.7.7:
      Git 1.7.6.6
      imap-send: remove dead code
  2. Sync with 1.7.6.6

    gitster committed Feb 6, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Git 1.7.6.6

    gitster committed Feb 6, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. imap-send: remove dead code

    peff committed with gitster Feb 6, 2012
    The imap-send code was adapted from another project, and
    still contains many unused bits of code. One of these bits
    contains a type "struct string_list" which bears no
    resemblence to the "struct string_list" we use elsewhere in
    git. This causes the compiler to complain if git's
    string_list ever becomes part of cache.h.
    
    Let's just drop the dead code.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 18, 2012
  1. Git 1.7.8.4

    gitster committed Jan 18, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint-1.7.7' into maint

    gitster committed Jan 18, 2012
    * maint-1.7.7:
      Git 1.7.7.6
      diff-index: enable recursive pathspec matching in unpack_trees
    
    Conflicts:
    	GIT-VERSION-GEN
  3. Git 1.7.7.6

    gitster committed Jan 18, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. diff-index: enable recursive pathspec matching in unpack_trees

    pclouds committed with gitster Jan 15, 2012
    The pathspec structure has a few bits of data to drive various operation
    modes after we unified the pathspec matching logic in various codepaths.
    For example, max_depth field is there so that "git grep" can limit the
    output for files found in limited depth of tree traversal. Also in order
    to show just the surface level differences in "git diff-tree", recursive
    field stops us from descending into deeper level of the tree structure
    when it is set to false, and this also affects pathspec matching when
    we have wildcards in the pathspec.
    
    The diff-index has always wanted the recursive behaviour, and wanted to
    match pathspecs without any depth limit. But we forgot to do so when we
    updated tree_entry_interesting() logic to unify the pathspec matching
    logic.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 13, 2012
  1. Update draft release notes to 1.7.8.4

    gitster committed Jan 13, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint-1.7.7' into maint

    gitster committed Jan 13, 2012
    * 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
  3. Update draft release notes to 1.7.7.6

    gitster committed Jan 13, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'maint-1.7.6' into maint-1.7.7

    gitster committed Jan 13, 2012
    * maint-1.7.6:
      Update draft release notes to 1.7.6.6
      thin-pack: try harder to use preferred base objects as base
  5. Update draft release notes to 1.7.6.6

    gitster committed Jan 13, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. thin-pack: try harder to use preferred base objects as base

    peff committed with gitster Jan 12, 2012
    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. Merge branch 'maint-1.7.7' into maint

    gitster committed Jan 12, 2012
    * maint-1.7.7:
      attr: fix leak in free_attr_elem
      t2203: fix wrong commit command
  2. Merge branch 'maint-1.7.6' into maint-1.7.7

    gitster committed Jan 12, 2012
    * maint-1.7.6:
      attr: fix leak in free_attr_elem
      t2203: fix wrong commit command
  3. attr: fix leak in free_attr_elem

    peff committed with gitster Jan 12, 2012
    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>
Commits on Jan 11, 2012
  1. t2203: fix wrong commit command

    pclouds committed with gitster Jan 11, 2012
    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>
Commits on Jan 10, 2012
  1. Prepare for 1.7.8.4

    gitster committed Jan 10, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge the attributes fix in from maint-1.6.7 branch

    gitster committed Jan 10, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Prepare for 1.7.7.6

    gitster committed Jan 10, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge the attributes fix in from maint-1.6.6 branch

    gitster committed Jan 10, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Prepare for 1.7.6.6

    gitster committed Jan 10, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Documentation: rerere's rr-cache auto-creation and rerere.enabled

    gitster committed Jan 10, 2012
    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>
  7. attr.c: clarify the logic to pop attr_stack

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

    gitster committed Jan 10, 2012
    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>
  9. attr: drop misguided defensive coding

    peff committed with gitster Jan 10, 2012
    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>
  10. attr: don't confuse prefixes with leading directories

    peff committed with gitster Jan 10, 2012
    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>
Commits on Jan 9, 2012
  1. send-email: multiedit is a boolean config option

    peff committed with gitster Jan 9, 2012
    The sendemail.multiedit variable is meant to be a boolean.
    However, it is not marked as such in the code, which means
    we store its value literally. Thus in the do_edit function,
    perl ends up coercing it to a boolean value according to
    perl rules, not git rules. This works for "0", but "false",
    "no", or "off" will erroneously be interpreted as true.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 6, 2012
  1. Git 1.7.8.3

    gitster committed Jan 6, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>