Permalink
Commits on Nov 23, 2006
  1. GIT 1.4.4.1

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 23, 2006
  2. trust-executable-bit: fix breakage for symlinks

    An earlier commit f28b34a broke symlinks when trust-executable-bit
    is not set because it incorrectly assumed that everything was a
    regular file.
    
    Reported by Juergen Ruehle.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 23, 2006
  3. Move --pretty options into Documentation/pretty-formats.txt

    Asciidoc-include it into the manuals for programs that use the
    --pretty command-line option, for consistency among the docs.
    
    This describes all the pretty-formats currently listed in the cmit_fmt
    enum in commit.h, and also briefly describes the presence and format
    of the 'Merge: ' line in some pretty formats.
    
    There's a hedge that limiting your view of history can affect what
    goes in the Merge: line, and that --abbrev/--no-abbrev do nothing to
    the 'raw' format.
    
    Signed-off-by: Chris Riddoch <chris@syntacticsugar.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Chris Riddoch committed with Junio C Hamano Nov 21, 2006
Commits on Nov 22, 2006
  1. Doc: Make comment about merging in tutorial.txt more clear

    Rephrased a sentence in order to make more clear the concept of
    pull . branch
    
    Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    mignolo committed with Junio C Hamano Nov 20, 2006
  2. archive: use setvbuf() instead of setlinebuf()

    This tiny patch makes GIT compile again on HP-UX 11i.
    
    [jc: The setlinebuf() is described as unportable to BSD before
     4.2; it's not even in POSIX, while setvbuf() is in ISO C.]
    
    Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Michal Rokos committed with Junio C Hamano Nov 21, 2006
Commits on Nov 21, 2006
  1. Teach SubmittingPatches about git-commit -s

    As discussed on git mailing list let's teach the reader about
    the possiblity to have automatically signed off the commit running
    the git-commit -s command
    
    Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    mignolo committed with Junio C Hamano Nov 21, 2006
Commits on Nov 20, 2006
  1. do_for_each_ref: perform the same sanity check for leftovers.

    An earlier commit b37a562 added a check to see if the ref
    points at a valid object (as a part of 'negative ref' support
    which we currently do not use), but did so only while iterating
    over both packed and loose refs, and forgot to apply the same
    check while iterating over the remaining ones.
    
    We might want to replace the "if null then omit it" check with
    "eh --- what business does a 0{40} value have here?" complaint
    later since we currently do not use negative refs, but that is
    a separate issue.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 19, 2006
  2. git-fetch: follow lightweit tags as well.

    This side-ports commit fd19f620 from Cogito, in which I fixed
    exactly the same bug.  Somehow nobody noticed this for a long
    time in git.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 19, 2006
Commits on Nov 19, 2006
  1. Documentation: Correct alternates documentation, document http-altern…

    …ates
    
    For one, the documentation invalidly claimed that the paths have to be
    absolute when that's not the case and in fact there is a very valid reason
    not to use absolute paths (documented the reason as well).
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Nov 18, 2006
Commits on Nov 18, 2006
  1. Documentation: Define symref and update HEAD description

    HEAD was still described as a symlink instead of a symref.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Nov 18, 2006
  2. Document git-runstatus

    I copied most of the text from git-status.txt.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rene Scharfe committed with Junio C Hamano Nov 18, 2006
  3. git-apply: slightly clean up bitfield usage

    This patch fixes a sparse warning about inaccurate_eof being a
    "dubious one-bit signed bitfield", makes three more binary
    variables members of this (now unsigned) bitfield and adds a
    short comment to indicate the nature of two ternary variables.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rene Scharfe committed with Junio C Hamano Nov 18, 2006
  4. sparse fix: Using plain integer as NULL pointer

    Z_NULL is defined as 0, use a proper NULL pointer in its stead.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rene Scharfe committed with Junio C Hamano Nov 18, 2006
  5. sparse fix: non-ANSI function declaration

    The declaration of discard_cache() in cache.h already has its "void".
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rene Scharfe committed with Junio C Hamano Nov 18, 2006
  6. git-apply: Documentation typo fix

    inacurate -> inaccurate, sorry if it was a pun. ;-)
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Nov 18, 2006
  7. Fix git-for-each-refs broken for tags

    Unfortunately, git-for-each-refs is currently unusable for peeking into tag
    comments, since it uses freed pointers, so it just prints out all sort of
    garbage.
    
    This makes it strdup() contents and body values.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Nov 18, 2006
Commits on Nov 17, 2006
  1. "git fmt-merge-msg" SIGSEGV

    Ok, this is a _really_ stupid case, and I don't think it matters, but hey,
    we should never SIGSEGV.
    
    Steps to reproduce:
    
    	mkdir duh
    	cd duh
    	git init-db
    	git-fmt-merge-msg < /dev/null
    
    will cause a SIGSEGV in cmd_fmt_merge_msg(), because we're doing a
    strncmp() with a NULL current_branch.
    
    And yeah, it's an insane schenario, and no, it doesn't really matter. The
    only reason I noticed was that a broken version of my "git pull" into an
    empty directory would cause this.
    
    This silly patch just replaces the SIGSEGV with a controlled exit with an
    error message.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Nov 17, 2006
  2. git-pull: allow pulling into an empty repository

    We used to complain that we cannot merge anything we fetched
    with a local branch that does not exist yet.  Just treat the
    case as a natural extension of fast forwarding and make the
    local branch'es tip point at the same commit we just fetched.
    After all an empty repository without an initial commit is an
    ancestor of any commit.
    
    [jc: I added a trivial test.  We've become sloppy but we should
     stick to the discipline of covering new behaviour with new
     tests. ]
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Nov 16, 2006
Commits on Nov 15, 2006
  1. convert-objects: set _XOPEN_SOURCE to 600

    Otherwise OpenBSD header files drop S_ISLNK() definition which is used in
    an inline defined in cache.h
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 15, 2006
  2. Run "git repack -a -d" once more at end, if there's 1MB or more of no…

    …t-packed data.
    
    Although I converted upstream coreutils to git last month, I just
    reconverted coreutils once again, as a test, and ended up with a
    git repository of about 130MB (contrast with my packed git repo of
    size 52MB).  That was because there were a lot of commits (but < 1024)
    after the final automatic "git-repack -a -d".
    
    Running a final
      git-repack -a -d && git-prune-packed
    cut the final repository size down to the expected size.
    
    So this looks like an easy way to improve git-cvsimport.
    Just run "git repack ..." at the end if there's more than
    some reasonable amount of not-packed data.
    
    My choice of 1MB is a little arbitrarily.  I wouldn't mind missing
    the minimal repo size by 1MB.  At the other end of the spectrum,
    it's probably not worthwhile to pack everything when the total
    repository size is less than 1MB.
    
    Here's the patch:
    
    Signed-off-by: Jim Meyering <jim@meyering.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    meyering committed with Junio C Hamano Nov 15, 2006
  3. gitweb: Put back shortlog instead of graphiclog in the project list.

    Looks like a repo.or.cz-specific change slipped in.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    julliard committed with Junio C Hamano Nov 15, 2006
  4. git-checkout: allow pathspec to recover lost working tree directory

    It is often wanted on the #git channel that this were to work to
    recover removed directory:
    
    	rm -fr Documentation
    	git checkout -- Documentation
    	git checkout HEAD -- Documentation ;# alternatively
    
    Now it does.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 15, 2006
  5. git-checkout: do not allow -f and -m at the same time.

    Instead of silently ignoring one over the other, complain on
    this incompatible combination.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 15, 2006
  6. Seek back to current filepos when mmap()ing with NO_MMAP

    "git-index-pack --fix-thin" relies on mmap() not changing the current
    file position (otherwise the pack will be corrupted when writing the
    final SHA1). Meet that expectation.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Nov 15, 2006
  7. GIT 1.4.4

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 15, 2006
Commits on Nov 13, 2006
  1. Merge branch 'maint'

    * maint:
      Rework cvsexportcommit to handle binary files for all cases.
      Catch errors when writing an index that contains invalid objects.
      test-lib.sh: A command dying due to a signal is an unexpected failure.
      git-update-index(1): fix use of quoting in section title
    Junio C Hamano committed Nov 13, 2006
  2. Rework cvsexportcommit to handle binary files for all cases.

    Also adds test cases for adding removing and deleting
    binary and text files plus two tests for the checks on
    binary files.
    
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robinrosenberg committed with Junio C Hamano Nov 12, 2006
  3. Catch errors when writing an index that contains invalid objects.

    If git-write-index is called without --missing-ok, it reports invalid
    objects that it finds in the index. But without this patch it dies
    right away or may run into an infinite loop.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Johannes Sixt committed with Junio C Hamano Nov 13, 2006
  4. test-lib.sh: A command dying due to a signal is an unexpected failure.

    When test_expect_failure detects that a command failed, it still has to
    treat a program that crashed from a signal as unexpected failure.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Johannes Sixt committed with Junio C Hamano Nov 13, 2006
  5. git-update-index(1): fix use of quoting in section title

    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jonas committed with Junio C Hamano Nov 12, 2006
Commits on Nov 12, 2006
  1. GIT 1.4.4-rc2

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 12, 2006
  2. Merge branch 'maint'

    * maint:
      git-cvsserver: read from git with -z to get non-ASCII pathnames.
    Junio C Hamano committed Nov 12, 2006
  3. git-cvsserver: read from git with -z to get non-ASCII pathnames.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 10, 2006
Commits on Nov 11, 2006
  1. Merge branch 'maint'

    * maint:
      path-list: fix path-list-insert return value
    Junio C Hamano committed Nov 11, 2006
  2. path-list: fix path-list-insert return value

    When path-list-insert is called on an existing path, it returned an
    unrelated element in the list.  Luckily most of the callers are
    ignoring the return value, but merge-recursive uses it at three places
    and this would have resulted in a bogus rename detection.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 11, 2006