Permalink
Commits on Sep 12, 2008
  1. GIT 1.6.0.2

    gitster committed Sep 12, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'ho/maint-dashless' into maint

    gitster committed Sep 12, 2008
    * ho/maint-dashless:
      Start conforming code to "git subcmd" style part 2
  3. Fix some manual typos.

    Ralf Wildenhues committed with gitster Sep 12, 2008
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 11, 2008
  1. Use compatibility regex library also on FreeBSD

    peff committed with gitster Sep 11, 2008
    Commit 3632cfc makes the same change for Darwin; however, the problem
    also exists on FreeBSD.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Use compatibility regex library also on AIX

    Johannes Sixt committed with gitster Sep 11, 2008
    This augments 3632cfc (Use compatibility regex library on Darwin,
    2008-09-07), which already carries a "Tested-by" statement for AIX,
    but that test was actually done with this patch included.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Tested-by: Mike Ralphson <mike@abacus.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 10, 2008
  1. Update draft release notes for 1.6.0.2

    gitster committed Sep 10, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Use compatibility regex library for OSX/Darwin

    ArjenL committed with gitster Sep 7, 2008
    The standard libc regex library on OSX does not support alternation
    in POSIX Basic Regular Expression mode.  This breaks the diff.funcname
    functionality on OSX.
    
    To fix this, we use the GNU regex library which is already present in
    the compat/ diretory for the MinGW port.  However, simply adding compat/
    to the COMPAT_CFLAGS variable causes a conflict between the system
    fnmatch.h and the one present in compat/.  To remedy this, move the
    regex and fnmatch functionality to their own subdirectories in compat/
    so they can be included seperately.
    
    Signed-off-by: Arjen Laarhoven <arjen@yaph.org>
    Tested-by: Mike Ralphson <mike@abacus.co.uk> (AIX)
    Tested-by: Johannes Sixt <johannes.sixt@telecom.at> (MinGW)
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl

    neoeinstein committed with gitster Sep 10, 2008
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Git.pm: Use File::Temp->tempfile instead of ->new

    neoeinstein committed with gitster Sep 8, 2008
    Perl 5.8.0 ships with File::Temp 0.13, which does not have the new()
    interface introduced in 0.14, as pointed out by Tom G. Christensen.
    
    This modifies Git.pm to use the more established tempfile() interface
    and updates 'git svn' to match.
    
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Tested-by: Tom G. Christensen <tgc@statsbiblioteket.dk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. t7501: always use test_cmp instead of diff

    Miklos Vajna committed with gitster Sep 10, 2008
    This should make the output more readable (by default using diff -u)
    when some tests fail.
    
    Also changed the diff order from "current expected" to "expected
    current".
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Merge branch 'jc/maint-log-grep' into maint

    gitster committed Sep 10, 2008
    * jc/maint-log-grep:
      log --author/--committer: really match only with name part
  7. Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maint

    gitster committed Sep 10, 2008
    * jc/maint-hide-cr-in-diff-from-less:
      diff: Help "less" hide ^M from the output
  8. Merge branch 'jc/maint-checkout-fix' into maint

    gitster committed Sep 10, 2008
    * jc/maint-checkout-fix:
      checkout: do not check out unmerged higher stages randomly
  9. Merge branch 'np/maint-safer-pack' into maint

    gitster committed Sep 10, 2008
    * np/maint-safer-pack:
      fixup_pack_header_footer(): use nicely aligned buffer sizes
      index-pack: use fixup_pack_header_footer()'s validation mode
      pack-objects: use fixup_pack_header_footer()'s validation mode
      improve reliability of fixup_pack_header_footer()
      pack-objects: improve returned information from write_one()
Commits on Sep 9, 2008
  1. Start conforming code to "git subcmd" style part 2

    heikkiorsila committed with gitster Sep 9, 2008
    User notifications are presented as 'git cmd', and code comments
    are presented as '"cmd"' or 'git's cmd', rather than 'git-cmd'.
    
    Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 6, 2008
  1. Update draft release notes for 1.6.0.2

    gitster committed Sep 6, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. stash: refresh the index before deciding if the work tree is dirty

    gitster committed Sep 4, 2008
    Unlike the case where the user does have a real change in the work tree,
    refusing to work because of unclean stat information is not very helpful.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Nanako Shiraishi <nanako3@lavabit.com>
  3. Merge branch 'maint' of git://repo.or.cz/git-gui into maint

    gitster committed Sep 6, 2008
    * 'maint' of git://repo.or.cz/git-gui:
      git-gui: Fix diff parsing for lines starting with "--" or "++"
      git-gui: Fix string escaping in po2msg.sh
      git gui: show diffs with a minimum of 1 context line
      git-gui: update all remaining translations to French.
      git-gui: Update french translation
Commits on Sep 5, 2008
  1. Mention the fact that 'git annotate' is only for backward compatibility.

    gitster committed Sep 5, 2008
    When somebody is reading git-blame.txt (or git-annotate.txt) for the first
    time, the message we would like to send is:
    
     (1) Here is why you would want to use this command, what it can do
         (perhaps more than what you would have expected from "$scm blame"),
         and how you tell it to do what it does.
    
         This is obvious.
    
     (2) You might have heard of the command with the other name.  There is no
         difference between the two, except they differ in their default
         output formats.
    
         This is essential to answer: "git has both?  how are they different?"
    
     (3) We tend to encourage blame over annotate for new scripts and new
         people, but there is no reason to choose one over the other.
    
         This is not as important as (2), but would be useful to avoid
         repeated questions about "when will we start deprecating this?"
    
    As long as we describe (2) on git-annotate page clearly enough, people who
    read git-blame page first and get curious can refer to git-annotate page.
    While at it, subtly hint (3) without being overly explicit.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. "blame -c" should be compatible with "annotate"

    gitster committed Sep 5, 2008
    There is no reason to have a separate variable cmd_is_annotate;
    OUTPUT_ANNOTATE_COMPAT option is supposed to produce the compatibility
    output, and we should produce the same output even when the command was
    not invoked as "annotate" but as "blame -c".
    
    Noticed by Pasky.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. log --author/--committer: really match only with name part

    gitster committed Sep 5, 2008
    When we tried to find commits done by AUTHOR, the first implementation
    tried to pattern match a line with "^author .*AUTHOR", which later was
    enhanced to strip leading caret and look for "^author AUTHOR" when the
    search pattern was anchored at the left end (i.e. --author="^AUTHOR").
    
    This had a few problems:
    
     * When looking for fixed strings (e.g. "git log -F --author=x --grep=y"),
       the regexp internally used "^author .*x" would never match anything;
    
     * To match at the end (e.g. "git log --author='google.com>$'"), the
       generated regexp has to also match the trailing timestamp part the
       commit header lines have.  Also, in order to determine if the '$' at
       the end means "match at the end of the line" or just a literal dollar
       sign (probably backslash-quoted), we would need to parse the regexp
       ourselves.
    
    An earlier alternative tried to make sure that a line matches "^author "
    (to limit by field name) and the user supplied pattern at the same time.
    While it solved the -F problem by introducing a special override for
    matching the "^author ", it did not solve the trailing timestamp nor tail
    match problem.  It also would have matched every commit if --author=author
    was asked for, not because the author's email part had this string, but
    because every commit header line that talks about the author begins with
    that field name, regardleses of who wrote it.
    
    Instead of piling more hacks on top of hacks, this rethinks the grep
    machinery that is used to look for strings in the commit header, and makes
    sure that (1) field name matches literally at the beginning of the line,
    followed by a SP, and (2) the user supplied pattern is matched against the
    remainder of the line, excluding the trailing timestamp data.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. git-gui: Fix diff parsing for lines starting with "--" or "++"

    spearce committed Sep 5, 2008
    Languages like Lua and SQL use "--" to mark a line as commented out.
    If this appears at column 0 and is part of the pre-image we may see
    "--- foo" in the diff, indicating that the line whose content is
     "-- foo" has been removed from the new version.
    
    git-gui was incorrectly parsing "--- foo" as the old file name
    in the file header, causing it to generate a bad patch file when
    the user tried to stage or unstage a hunk or the selected line.
    We need to keep track of where we are in the parsing so that we do
    not misread a deletion or addition record as part of the header.
    
    Reported-by: Alexander Gladysh <agladysh@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Sep 4, 2008
  1. diff --cumulative is a sub-option of --dirstat

    gitster committed Sep 3, 2008
    The option used to be implemented as if it is a totally independent one,
    but "git diff --cumulative" would not mean anything without "--dirstat".
    
    This makes --cumulative imply --dirstat.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. bash completion: Hide more plumbing commands

    Petr Baudis committed with gitster Aug 26, 2008
    git <tab><tab> still shows way too many commands, some of them
    are clearly plumbing. This patch hides the plumbing commands
    liberally (that is, in special cases, users still might want to
    call one of the hidden commands, a *normal* workflow should never
    involve these, though - and if it does, we have a UI problem anyway).
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 3, 2008
  1. Start 1.6.0.2 maintenance cycle

    gitster committed Sep 3, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'nd/worktree' into maint

    gitster committed Sep 3, 2008
    * nd/worktree:
      setup_git_directory(): fix move to worktree toplevel directory
      update-index: fix worktree setup
      read-tree: setup worktree if merge is required
      grep: fix worktree setup
      diff*: fix worktree setup
  3. Merge branch 'ho/dashless' into maint

    gitster committed Sep 3, 2008
    * ho/dashless:
      tests: use "git xyzzy" form (t7200 - t9001)
      tests: use "git xyzzy" form (t7000 - t7199)
      tests: use "git xyzzy" form (t3600 - t6999)
      tests: use "git xyzzy" form (t0000 - t3599)
      'git foo' program identifies itself without dash in die() messages
      Start conforming code to "git subcmd" style
  4. tests: use "git xyzzy" form (t7200 - t9001)

    Nanako Shiraishi committed with gitster Sep 3, 2008
    Converts tests between t7201-t9001.
    
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. tests: use "git xyzzy" form (t7000 - t7199)

    Nanako Shiraishi committed with gitster Sep 3, 2008
    Converts tests between t7001-t7103.
    
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Fix passwd(5) ref and reflect that commit doens't use commit-tree

    jonas committed with gitster Sep 3, 2008
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. improve handling of sideband message display

    Nicolas Pitre committed with gitster Sep 3, 2008
    Currently the code looks for line break characters in order to prepend
    "remote: " to every line received as many lines can be sent in a single
    chunk.  However the opposite might happen too, i.e. a single message
    line split amongst multiple chunks.  This patch adds support for the
    later case to avoid displays like:
    
    	remote: Compressing objeremote: cts: 100% (313/313), done.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. tests: use "git xyzzy" form (t3600 - t6999)

    Nanako Shiraishi committed with gitster Sep 3, 2008
    Converts tests between t3600-t6300.
    
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. tests: use "git xyzzy" form (t0000 - t3599)

    Nanako Shiraishi committed with gitster Sep 3, 2008
    Converts tests between t0050-t3903.
    
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. checkout: fix message when leaving detached HEAD

    peff committed with gitster Sep 3, 2008
    The shell version of git checkout would print:
    
      Previous HEAD position was 1234abcd... commit subject line
    
    when leaving a detached HEAD for another commit. Ths C
    version attempted to implement this, but got the condition
    wrong such that the behavior never triggered.
    
    This patch simplifies the conditions for showing the message
    to the ones used by the shell version: any time we are
    leaving a detached HEAD and the new and old commits are not
    the same (this suppresses it for the "git checkout -b new"
    case recommended when you enter the detached state).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. clone: fix creation of explicitly named target directory

    Clemens Buchacher committed with gitster Sep 3, 2008
    'git clone <repo> path/' (note the trailing slash) fails, because the
    entire path is interpreted as leading directories. So when mkdir tries to
    create the actual path, it already exists.
    
    This makes sure trailing slashes are removed.
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>