Permalink
Commits on Oct 3, 2007
  1. GIT 1.5.3.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 3, 2007
  2. Add test case for ls-files --with-tree

    This tests basic functionality and also exercises a bug noticed
    by Keith Packard, (prune_cache followed by add_index_entry can
    trigger an attempt to realloc a pointer into the middle of an
    allocated buffer).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    cworth-gh committed with gitster Oct 3, 2007
  3. Must not modify the_index.cache as it may be passed to realloc at som…

    …e point.
    
    The index cache is not static, growing as new entries are added. If
    entries are added after prune_cache is called, cache will no longer
    point at the base of the allocation, and realloc will not be happy.
    
    I verified that this was the only place in the current source which
    modified any index_state.cache elements aside from the alloc/realloc
    calls in read-cache by changing the type of the element to 'struct
    cache_entry ** const cache' and recompiling.
    
    A more efficient patch would create a separate 'cache_base' value to
    track the allocation and then fix things up when reallocation was
    necessary, instead of the brute-force memmove used here.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    keith-packard committed with gitster Oct 3, 2007
  4. the ar tool is called gar on some systems

    Some systems that have only installed the GNU toolchain (prefixed with "g")
    do not provide "ar" but only "gar".  Make configure find this tool as well.
    
    Signed-off-by: Robert Schiele <rschiele@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    schiele committed with gitster Oct 3, 2007
  5. rename diff_free_filespec_data_large() to diff_free_filespec_blob()

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 3, 2007
  6. diffcore-rename: cache file deltas

    We find rename candidates by computing a fingerprint hash of
    each file, and then comparing those fingerprints. There are
    inherently O(n^2) comparisons, so it pays in CPU time to
    hoist the (rather expensive) computation of the fingerprint
    out of that loop (or to cache it once we have computed it once).
    
    Previously, we didn't keep the filespec information around
    because then we had the potential to consume a great deal of
    memory. However, instead of keeping all of the filespec
    data, we can instead just keep the fingerprint.
    
    This patch implements and uses diff_free_filespec_data_large
    to accomplish that goal. We also have to change
    estimate_similarity not to needlessly repopulate the
    filespec data when we already have the hash.
    
    Practical tests showed 4.5x speedup for a 10% memory usage
    increase.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Sep 25, 2007
  7. Mention 'cpio' dependency in INSTALL

    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jherland committed with gitster Oct 2, 2007
  8. Make git-pull complain and give advice when there is nothing to merge…

    … with
    
    Signed-off-by: Federico Mena Quintero <federico@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Federico Mena Quintero committed with gitster Oct 2, 2007
  9. Note that git-branch will not automatically checkout the new branch

    Signed-off-by: Federico Mena Quintero <federico@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Federico Mena Quintero committed with gitster Oct 2, 2007
  10. Add documentation for --track and --no-track to the git-branch docs.

    Signed-off-by: Federico Mena Quintero <federico@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Federico Mena Quintero committed with gitster Oct 2, 2007
  11. Say when --track is useful in the git-checkout docs.

    The documentation used to say what the option does, but it
    didn't mention a use case.
    
    Signed-off-by: Federico Mena Quintero <federico@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Federico Mena Quintero committed with gitster Oct 2, 2007
Commits on Oct 2, 2007
  1. Fix typo in config.txt

    There was an 'l' (ell) instead of a '1' (one) in one of the gitlinks.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Oct 2, 2007
  2. for-each-ref: fix %(numparent) and %(parent)

    The string value of %(numparent) was not returned correctly.
    Also %(parent) misbehaved for the root commits (returned garbage)
    and merge commits (returned first parent, followed by a space).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 2, 2007
  3. git-commit: initialize TMP_INDEX just to be sure.

    We rely on TMP_INDEX variable to decide if we are doing a partial commit,
    as it is only set in the partial commit codepath.  But the variable is
    never initialized.  A stray environment variable from outside could
    ruin the day.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 2, 2007
  4. fixed link in documentation of diff-options

    Signed-off-by: Steffen Prohaska <prohaska@zib.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    sprohaska committed with gitster Oct 2, 2007
Commits on Oct 1, 2007
  1. Whip post 1.5.3.3 maintenance series into shape.

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 1, 2007
  2. git stash: document apply's --index switch

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Sep 30, 2007
  3. post-receive-hook: Remove the From field from the generated email hea…

    …der so that the pusher's name is used
    
    Using the name of the committer of the revision at the tip of the
    updated ref is not sensible.  That information is available in the email
    itself should it be wanted, and by supplying a "From", we were
    effectively hiding the person who performed the push - which is useful
    information in itself.
    
    Signed-off-by: Andy Parkins <andyparkins@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    andyparkins committed with gitster Sep 28, 2007
Commits on Sep 30, 2007
  1. git-remote: exit with non-zero status after detecting errors.

    Some subcommands of "git-remote" detected and issued error
    messages but did not signal that to the calling process with
    exit status.
    
    Signed-off-by: Jari Aalto <jari.aalto@cante.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jaalto committed with gitster Sep 30, 2007
  2. rebase -i: squash should retain the authorship of the _first_ commit

    It was determined on the mailing list, that it makes more sense for a
    "squash" to keep the author of the first commit as the author for the
    result of the squash.
    
    Make it so.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Sep 29, 2007
  3. git-add--interactive: Improve behavior on bogus input

    1) Previously, any menu would cause a perl error when entered '0',
       which is never a valid option.
    
    2) Entering a bogus choice (like 998 or 4-2) surprisingly caused
       the same behavior as if the user had just hit 'enter', which
       means to carry out the selected action on the selected items.
       Entering such bogus input is now a no-op and the sub-menu
       doesn't exit.
    
    Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jlherren committed with gitster Sep 26, 2007
  4. git-add--interactive: Allow Ctrl-D to exit

    Hitting Ctrl-D (EOF) is a common way to exit shell-like tools.
    When in a sub-menu it will still behave as if an empty line had
    been entered, carrying out the action on the selected items and
    returning to the previous menu.
    
    Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jlherren committed with gitster Sep 26, 2007
Commits on Sep 29, 2007
  1. GIT 1.5.3.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 29, 2007
  2. Fix revision log diff setup, avoid unnecessary diff generation

    We used to incorrectly start calculating diffs whenever any argument but
    '-z' was recognized by the diff options parsing. That was bogus, since not
    all arguments result in diffs being needed, so we just waste a lot of time
    and effort on calculating diffs that don't matter.
    
    This actually also fixes another bug in "git log". Try this:
    
    	git log -C
    
    and notice how it prints an extra empty line in between log entries, even
    though it never prints the actual diff (because we didn't ask for any diff
    format, so the diff machinery never prints anything).
    
    With this patch, that bogus empty line is gone, because "revs->diff" is
    never set.  So this isn't just a "wasted time and effort" issue, it's also
    a slight semantic fix.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    torvalds committed with gitster Sep 29, 2007
  3. git-bundle: fix commandline examples in the manpage

    Multiple commands were displayed in one line, making the manpage hard to read.
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Sep 26, 2007
  4. Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

    * 'mergetool' of git://repo.or.cz/git/mergetool:
      mergetool: Fix typo in options passed to kdiff3
      mergetool: fix emerge when running in a subdirectory
      Mergetool generating blank files (1.5.3)
    gitster committed Sep 29, 2007
  5. mergetool: Fix typo in options passed to kdiff3

    Fix missing double hyphens in "-L1" and "-L2"
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    tytso committed Sep 29, 2007
  6. mergetool: fix emerge when running in a subdirectory

    Only pass the basename of the output filename when to emerge, since
    emerge interprets non-absolute pathnames relative to the containing
    directory of the output buffer.
    
    Thanks to Kelvie Wong for pointing this out.
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    tytso committed Sep 29, 2007
  7. Mergetool generating blank files (1.5.3)

    When mergetool is run from a subdirectory, "ls-files -u" nicely
    limits the output to conflicted files in that directory, but
    we need to give the full path to cat-file plumbing to grab the
    contents of stages.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    gitster committed with tytso Sep 27, 2007
Commits on Sep 27, 2007
  1. quiltimport: Skip non-existent patches

    When quiltimport encounters a non-existent patch in the series file,
    just skip to the next patch. This matches the behavior of quilt.
    
    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dbnicholson committed with gitster Sep 27, 2007
Commits on Sep 26, 2007
  1. apply: get rid of --index-info in favor of --build-fake-ancestor

    git-am used "git apply -z --index-info" to find the original versions
    of the files touched by the diff, to be able to do an inexpensive
    three-way merge.
    
    This operation makes only sense in a repository, since the index
    information in the diff refers to blobs, which have to be present in
    the current repository.
    
    Therefore, teach "git apply" a mode to write out the result as an
    index file to begin with, obviating the need for scripts to do it
    themselves.
    
    The sole user for --index-info is "git am" is converted to
    use --build-fake-ancestor in this patch.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Sep 17, 2007
  2. Move make_cache_entry() from merge-recursive.c into read-cache.c

    The function make_cache_entry() is too useful to be hidden away in
    merge-recursive.  So move it to libgit.a (exposing it via cache.h).
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jasampler committed with gitster Sep 11, 2007
  3. core-tutorial: correct URL

    The tinyurl is incorrect -- it attempts to go to groups.osdl.org,
    which is gone.  Either use the full URL (in patch) or create a new
    tinyurl for this URL.
    
    Is the web page (where I first saw this problem) generated from
    this txt file?
    http://www.kernel.org/pub/software/scm/git/docs/core-tutorial.html
    If not, it needs to be updated also.
    
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Randy Dunlap committed with gitster Sep 26, 2007
  4. Fix spelling of overridden in documentation

    Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    sbohrer committed with gitster Sep 26, 2007
  5. gitattributes.txt: Be more to the point in the filter driver descript…

    …ion.
    
    The description was meant to emphasizes that the project should remain
    usable even if the filter driver was not used. This makes it more explicit
    and removes the "here is rope to hang yourself" paraphrase.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Johannes Sixt committed with gitster Sep 25, 2007