Skip to content
Commits on May 3, 2009
  1. @gitster

    GIT 1.6.2.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 3, 2009
  2. @gitster

    Merge branch 'np/maint-no-ofs-delta' into maint

    * np/maint-no-ofs-delta:
      honor repack.usedeltabaseoffset when fetching packs
    gitster committed May 3, 2009
  3. @gitster

    Merge branch 'maint-1.6.1' into maint

    * maint-1.6.1:
      GIT 1.6.1.4
    
    Conflicts:
    	GIT-VERSION-GEN
    gitster committed May 3, 2009
  4. @gitster

    GIT 1.6.1.4

    With a handful of fixes backmerged from 1.6.2.X series
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 3, 2009
  5. @gitster

    Merge branch 'jc/maint-read-tree-multi' into maint

    * jc/maint-read-tree-multi:
      checkout branch: prime cache-tree fully
      read-tree -m A B: prime cache-tree from the switched-to tree
      Move prime_cache_tree() to cache-tree.c
      read-tree A B: do not corrupt cache-tree
    gitster committed May 3, 2009
  6. @gitster

    Merge branch 'mk/maint-apply-swap' into maint

    * mk/maint-apply-swap:
      tests: make test-apply-criss-cross-rename more robust
      builtin-apply: keep information about files to be deleted
      tests: test applying criss-cross rename patch
    gitster committed May 3, 2009
  7. @gitster

    Merge branch 'mm/maint-add-p-quit' into maint

    * mm/maint-add-p-quit:
      git add -p: add missing "q" to patch prompt
    gitster committed May 3, 2009
  8. @gitster

    Merge branch 'lt/pack-object-memuse' into maint

    * lt/pack-object-memuse:
      show_object(): push path_name() call further down
      process_{tree,blob}: show objects without buffering
    gitster committed May 3, 2009
  9. @gitster

    Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1

    * jc/maint-1.6.0-keep-pack:
      pack-objects: don't loosen objects available in alternate or kept packs
      t7700: demonstrate repack flaw which may loosen objects unnecessarily
      Remove --kept-pack-only option and associated infrastructure
      pack-objects: only repack or loosen objects residing in "local" packs
      git-repack.sh: don't use --kept-pack-only option to pack-objects
      t7700-repack: add two new tests demonstrating repacking flaws
      is_kept_pack(): final clean-up
      Simplify is_kept_pack()
      Consolidate ignore_packed logic more
      has_sha1_kept_pack(): take "struct rev_info"
      has_sha1_pack(): refactor "pretend these packs do not exist" interface
      git-repack: resist stray environment variable
    gitster committed May 3, 2009
  10. @gitster

    Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1

    * jc/maint-1.6.0-diff-borrow-carefully:
      diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
    gitster committed May 3, 2009
  11. @gitster

    Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1

    * bs/maint-1.6.0-tree-walk-prefix:
      match_tree_entry(): a pathspec only matches at directory boundaries
      tree_entry_interesting: a pathspec only matches at directory boundary
    gitster committed May 3, 2009
Commits on May 2, 2009
  1. @gitster

    honor repack.usedeltabaseoffset when fetching packs

    If the local receiving repository has disabled the use of delta base
    offset, for example to retain compatibility with older versions of
    Git that predate OFS_DELTA, we shouldn't ask for ofs-delta support
    when we obtain a pack from the remote server.
    
    [ issue noticed by Shawn Pearce ]
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nicolas Pitre committed with gitster May 1, 2009
Commits on Apr 29, 2009
  1. @gitster

    Merge branch 'maint-1.6.1' into maint

    * maint-1.6.1:
      diff -c -p: do not die on submodules
    gitster committed Apr 29, 2009
  2. @gitster

    Merge branch 'maint-1.6.0' into maint-1.6.1

    * maint-1.6.0:
      diff -c -p: do not die on submodules
    gitster committed Apr 29, 2009
  3. @gitster

    diff -c -p: do not die on submodules

    The combine diff logic knew only about blobs (and their checked-out form
    in the work tree, either regular files or symlinks), and barfed when fed
    submodules.  This "externalizes" gitlinks in the same way as the normal
    patch generation codepath does (i.e. "Subproject commit Xxx\n") to fix the
    issue.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 29, 2009
Commits on Apr 28, 2009
  1. @gitster

    Merge branch 'maint-1.6.1' into maint

    * maint-1.6.1:
      grep: fix segfault when "git grep '('" is given
      Documentation: fix a grammatical error in api-builtin.txt
      builtin-merge: fix a typo in an error message
    gitster committed Apr 28, 2009
  2. @gitster

    Merge branch 'maint-1.6.0' into maint-1.6.1

    * maint-1.6.0:
      grep: fix segfault when "git grep '('" is given
      Documentation: fix a grammatical error in api-builtin.txt
      builtin-merge: fix a typo in an error message
    gitster committed Apr 28, 2009
  3. @torvalds @gitster

    grep: fix segfault when "git grep '('" is given

    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    torvalds committed with gitster Apr 27, 2009
Commits on Apr 27, 2009
  1. @allancaffee @gitster

    Documentation: fix a grammatical error in api-builtin.txt

    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    allancaffee committed with gitster Apr 13, 2009
  2. @allancaffee @gitster

    builtin-merge: fix a typo in an error message

    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Acked-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    allancaffee committed with gitster Apr 13, 2009
Commits on Apr 25, 2009
  1. @gitster

    Merge branch 'maint-1.6.1' into maint

    * maint-1.6.1:
      test-genrandom: Add newline to usage string
    gitster committed Apr 24, 2009
  2. @gitster

    Merge branch 'maint-1.6.0' into maint-1.6.1

    * maint-1.6.0:
      test-genrandom: Add newline to usage string
    gitster committed Apr 24, 2009
Commits on Apr 23, 2009
  1. @bebarino @gitster

    test-genrandom: Add newline to usage string

    A minor fix to place the terminal input on a new line if test-genrandom
    is run with no arguments.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bebarino committed with gitster Apr 23, 2009
Commits on Apr 20, 2009
  1. @mkiedrowicz @gitster

    tests: make test-apply-criss-cross-rename more robust

    I realized that this test does check if git-apply succeeds, but doesn't
    tell if it applies patches correctly. So I added test_cmp to check it.
    
    I also added a test which checks swapping three files.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mkiedrowicz committed with gitster Apr 18, 2009
  2. @mkiedrowicz @gitster

    builtin-apply: keep information about files to be deleted

    Example correct diff generated by `diff -M -B' might look like this:
    
    	diff --git a/file1 b/file2
    	similarity index 100%
    	rename from file1
    	rename to file2
    	diff --git a/file2 b/file1
    	similarity index 100%
    	rename from file2
    	rename to file1
    
    Information about removing `file2' comes after information about creation
    of new `file2' (renamed from `file1'). Existing implementation isn't able to
    apply such patch, because it has to know in advance which files will be
    removed.
    
    This patch populates fn_table with information about removal of files
    before calling check_patch() for each patch to be applied.
    
    Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mkiedrowicz committed with gitster Apr 11, 2009
  3. @mkiedrowicz @gitster

    tests: test applying criss-cross rename patch

    Originally reported by Linus in $gmane/116198
    
    Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mkiedrowicz committed with gitster Apr 11, 2009
  4. @flichtenheld @gitster

    gitcvs-migration: Link to git-cvsimport documentation

    Signed-off-by: Frank Lichtenheld <flichtenheld@astaro.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    flichtenheld committed with gitster Apr 18, 2009
  5. @dscho @gitster

    Fix off-by-one in read_tree_recursive

    Found by valgrind.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Apr 20, 2009
  6. @gitster

    checkout branch: prime cache-tree fully

    When switching to another branch, the earlier code relied on incremental
    invalidation of cache-tree entries to degrade it.  While it is not wrong
    per-se, we know that the resulting index must fully match the branch we
    are switching to unless the -m (merge) option is used.
    
    We should simply fully re-prime the cache-tree using the new tree object
    in such a case.  And for safety, invalidate the cache-tree as a whole in
    other cases.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 20, 2009
  7. @gitster

    read-tree -m A B: prime cache-tree from the switched-to tree

    When switching to a new branch with "read-tree -m A B", the resulting
    index must match tree B and we can prime the cache tree with it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 20, 2009
  8. @gitster

    Move prime_cache_tree() to cache-tree.c

    The interface to build cache-tree belongs there.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 20, 2009
  9. @gitster

    read-tree A B: do not corrupt cache-tree

    An earlier commit aab3b9a (read-tree A B C: do not create a bogus index
    and do not segfault, 2009-03-12) resurrected the support for an obscure
    (but useful) feature to read and overlay more than one tree into the index
    without the -m (merge) option.  But the fix was not enough.
    
    Exercising this feature exposes a longstanding bug in the code that primes
    the cache-tree in the index from the tree that was read.  The intention
    was that when we know that the index must exactly match the tree we just
    read, we prime the entire cache-tree with it.
    
    However, the logic to detect that case incorrectly triggered if you read
    two trees without -m.  This resulted in a corrupted cache-tree, and
    write-tree would have produced an incorrect tree object out of such an
    index.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 20, 2009
  10. @wincent @gitster

    git add -p: add missing "q" to patch prompt

    Commit cbd3a01 added a new "q" subcommand to the "git add -p"
    command loop, but forgot to add it to the prompt.
    
    Signed-off-by: Wincent Colaiuta <win@wincent.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    wincent committed with gitster Apr 20, 2009
  11. @gitster

    GIT 1.6.2.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 19, 2009
  12. @pclouds @gitster

    Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins

    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 Apr 20, 2009
Something went wrong with that request. Please try again.