Permalink
Commits on Aug 3, 2006
  1. GIT 1.4.2-rc3

    We ended up merging too many stuff after -rc2, so here is
    another round of release candidate.  Non bugfixes will be
    queued to "next" from now on until a real 1.4.2 happens.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 3, 2006
  2. Documentation/git.txt: link git-svn and git-instaweb from the main page.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 3, 2006
  3. Merge branch 'jc/sideband'

    * jc/sideband:
      sideband: do not use color, just say "remote:"
      fetch/clone: mark messages from remote side stand out.
    Junio C Hamano committed Aug 3, 2006
  4. sideband: do not use color, just say "remote:"

    ... per suggestion by Andrew.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 3, 2006
  5. Show both blob names from "git diff blob1 blob2"

    Earlier we deliberately showed only blob1's name because showing
    both names labeled the output as a renaming patch.  Now the output
    routine (namely, diff.c::resolve_rename_copy()) is taught not to
    use pathname comparison to tell if a filepair is a rename, we can
    safely do this change.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 3, 2006
  6. diff.c: do not use pathname comparison to tell renames

    The final output from diff used to compare pathnames between
    preimage and postimage to tell if the filepair is a rename/copy.
    By explicitly marking the filepair created by diffcore_rename(),
    the output routine, resolve_rename_copy(), does not have to do
    so anymore.  This helps feeding a filepair that has different
    pathnames in one and two elements to the diff machinery (most
    notably, comparing two blobs).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 3, 2006
  7. Add a couple of subdirectory tests.

    We still have too few of them, but we have to start from somewhere.
    The general rule is to make tests easy to debug when run with -v (notice
    use of seemingly useless echo everywhere in the new tests).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 3, 2006
  8. read-tree: shadowed variable fix.

    Recent changes to built-ins broke committing from subdirectory,
    because the unused parameter "prefix" shadowed a global variable.
    
    Spotted by Jeff King.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 3, 2006
  9. @chunga

    fixed variable declaration in gitk

    Signed-off-by: Michael <barra_cuda@katamail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    chunga committed with Junio C Hamano Aug 3, 2006
  10. Fix "git diff blob1 blob2" showing the diff in reverse.

    This was introduced by mistake when revision.c::add_pending_object()
    was modified to use object-array instead of object-list.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 3, 2006
  11. @matled

    git-grep: document --and, --or, --not, ( and )

    [jc: added an example section.]
    
    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matled committed with Junio C Hamano Aug 2, 2006
  12. @matthiask

    use declarations from builtin.h for builtin commands

    Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matthiask committed with Junio C Hamano Aug 2, 2006
  13. @matthiask

    Make git-repo-config a builtin

    Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matthiask committed with Junio C Hamano Aug 2, 2006
Commits on Aug 2, 2006
  1. @matthiask

    Make git-prune-packed a builtin

    Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matthiask committed with Junio C Hamano Aug 2, 2006
  2. @peff

    git-annotate: remove extraneous debugging line

    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    peff committed with Junio C Hamano Aug 2, 2006
  3. @peff

    Documentation: convert uses of git-link macro to gitlink

    There isn't and never was such a macro; all uses are typos.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    peff committed with Junio C Hamano Aug 2, 2006
  4. @peff

    git-push: remove obsolete git-push.sh

    This was converted to a C builtin over three months ago.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    peff committed with Junio C Hamano Aug 2, 2006
  5. @peff

    git-push: allow -f as an alias for --force

    This was already documented in the options section of the manpage. This
    patch implements it, adds it to the usage message, and mentions it at the
    top of the manpage.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    peff committed with Junio C Hamano Aug 2, 2006
  6. Remove cmd_usage() routine and re-organize the help/usage code.

    The cmd_usage() routine was causing warning messages due to a NULL
    format parameter being passed in three out of four calls. This is a
    problem if you want to compile with -Werror. A simple solution is to
    simply remove the GNU __attribute__ format pragma from the cmd_usage()
    declaration in the header file. The function interface was somewhat
    muddled anyway, so re-write the code to finesse the problem.
    
    [jc: this incidentally revealed that t9100 test assumed that the output
     from "git help" to be fixed in stone, but this patch lower-cases
     "Usage" to "usage".  Update the test not to rely on "git help" output.]
    
    Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Ramsay Allan Jones committed with Junio C Hamano Jul 30, 2006
  7. Fix header breakage due to redefining PATH_MAX.

    The header builtin.h was, incorrectly, redefining PATH_MAX which
    causes a header order dependency in builtin-write-tree.c.  The fix
    is to simply include <limits.h> directly to obtain the correct
    definition of PATH_MAX.
    
    Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Ramsay Allan Jones committed with Junio C Hamano Jul 30, 2006
  8. Add NO_C99_FORMAT to support older compilers.

    The NO_C99_FORMAT macro allows compilers that lack support for the
    ll,hh,j,z,t size specifiers (eg. gcc 2.95.2) to adapt the code to avoid
    runtime errors in the formatted IO functions.
    
    Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Ramsay Allan Jones committed with Junio C Hamano Jul 30, 2006
  9. New tests and en-passant modifications to mktag.

    These changes were originally part of the next patch, but have been
    split out since they were peripheral to the main purpose of that patch.
    
      - update comment describing the signature format to reflect
        the current code.
      - remove trailing \n in calls to error(), since a \n is already
        provided by error().
      - remove redundant call to get_sha1_hex().
      - call sha1_to_hex(sha1) to convert to ascii, rather than attempting
        to print the raw sha1.
    
    The new tests provide a regression suite to support the modifications
    to git-mktag in this and the next patch.
    
    Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Ramsay Allan Jones committed with Junio C Hamano Jul 29, 2006
  10. Fix installation of templates on ancient systems.

    Do not use $(call) for 'shell quoting' paths, and pass DESTDIR down
    to the templates makefile.
    
    [jc: we have fixed the main Makefile long time ago, but somehow
     forgot to apply the same fix to templates Makefile.]
    
    Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Ramsay Allan Jones committed with Junio C Hamano Jul 29, 2006
  11. Fix annotate test script; notice when git-annotate fails.

    The t8001-annotate.sh test claimed all tests pass, when in fact
    the git-annotate perl script failed to run! (prior to fixing the
    script to work with perl 5.5).
    
    Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Ramsay Allan Jones committed with Junio C Hamano Jul 29, 2006
  12. Ensure git-clone exits with error if perl script fails.

    This helps tests 5400,5600,5700,5710 "fail correctly" rather than
    give some false positives.  Also ensure cleanup actions in exit trap
    work correctly even if user has alias rm='rm -i'.
    
    Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Ramsay Allan Jones committed with Junio C Hamano Jul 29, 2006
Commits on Aug 1, 2006
  1. fetch/clone: mark messages from remote side stand out.

    When dealing with a corrupt or out of sync remote repository,
    the user often gets error messages like this:
    
    	error: refs/heads/devel does not point to a valid commit object!
    
    which leaves the user wondering if the breakage is on the local
    end or on the remote end.  This is unnecessarily alarming.
    
    This patch changes the way we display messages received from the
    remote side over the git protocol sideband (i.e. stderr stream
    of the remote process).  It shows them with blue background with
    white letters, but this presentation is subject to proposals of
    better ways from the list.
    
    The problem was pointed out by Andrew Morton.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 1, 2006
  2. Merge branch 'rs/rebase'

    * rs/rebase:
      rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
      rebase: Fix the detection of fast-forwarding of the current branch to upstream.
    Junio C Hamano committed Aug 1, 2006
  3. Merge branch 'ml/pager'

    Junio C Hamano committed Aug 1, 2006
  4. Merge branch 'jc/checkout'

    * jc/checkout:
      git-checkout: allow "checkout HEAD -- path"
    Junio C Hamano committed Aug 1, 2006
Commits on Jul 31, 2006
  1. @matled

    pager: config variable pager.color

    enable/disable colored output when the pager is in use
    
    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    matled committed with Junio C Hamano Jul 29, 2006
  2. Builtins: control the use of pager from the command table.

    This moves the built-in "always-use-pager" logic for log family
    to the command dispatch table of git wrapper.  This makes it
    easier to change the default use of pager, and has an added
    benefit that we fork and exec the pager early before packs are
    mmapped.
    
    Pointed out by Juergen Ruehle <j.ruehle@bmiag.de>.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jul 31, 2006
  3. Fix up some fallout from "setup_git_directory()" cleanups

    git-ls-files was broken by the setup_git_directory() calling changes,
    because I had missed the fact that the "prefix" variable in that file was
    static to the whole file, and unlike git-ls-tree (where I had fixed it
    up), it ended up using two different variables with the same name
    depending on what the scoping happened to be.
    
    This fixes it up properly (by just removing the static variable, and
    passing the automatic one around properly), and git-ls-files should work
    again.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Jul 31, 2006
  4. Fix double "close()" in ce_compare_data

    Doing an "strace" on "git diff" shows that we close() a file descriptor
    twice (getting EBADFD on the second one) when we end up in ce_compare_data
    if the index does not match the checked-out stat information.
    
    The "index_fd()" function will already have closed the fd for us, so we
    should not close it again.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Jul 31, 2006
  5. git-checkout: allow "checkout HEAD -- path"

    Even though -- is redundant in this case, we should allow it to prevent
    confusion.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jul 31, 2006
  6. rebase: Make the fast-fowarding message more user-friendly by using b…

    …ranch names instead of SHA1 IDs.
    
    Signed-off-by: Robert Shearman <rob@codeweavers.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Robert Shearman committed with Junio C Hamano Jul 27, 2006