Permalink
Commits on Dec 28, 2005
  1. GIT 1.0.6

    Junio C Hamano committed Dec 28, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 27, 2005
  1. Do not mark tags fetched via --tags flag as mergeable

    Junio C Hamano committed Dec 27, 2005
    Otherwise "git pull --tags" would mistakenly try to merge all of
    them, which is never what the user wants.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fix bogus tests on rev-list output.

    Junio C Hamano committed Dec 27, 2005
    These tests seem to mean checking the output with expected
    result, but was not doing its handrolled test helper function.
    
    Also fix the guard to workaround wc output that have whitespace
    padding, which was broken but not exposed because the test was
    not testing it ;-).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Guard a test against wc that pads its output with whitespace

    Junio C Hamano committed Dec 27, 2005
    Spotted by Johannes.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. copy_fd: close ifd on error

    Sam Ravnborg committed with Junio C Hamano Dec 27, 2005
    In copy_fd when write fails we ought to close input file descriptor.
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. GIT 1.0.5

    Junio C Hamano committed Dec 27, 2005
    Minor fixes.
    
    Starting from this one I won't be touching debian/ directory
    since the official maintainer seems to be reasonably quick to
    package up things.  The packaging procedure used there seems to
    be quite different from what I have, so I'd like to avoid
    potential confusion and reduce work by the official maintainer
    and myself.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Handle symlinks graciously

    dscho committed with Junio C Hamano Dec 26, 2005
    This patch converts a stat() to an lstat() call, thereby fixing the case
    when the date of a symlink was not the same as the one recorded in the
    index. The included test case demonstrates this.
    
    This is for the case that the symlink points to a non-existing file. If
    the file exists, worse things than just an error message happen.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. t5300: avoid false failures.

    Junio C Hamano committed Dec 27, 2005
    Johannes found that the test has 1/256 chance of falsely
    producing an uncorrupted idx file, causing the check to detect
    corruption fail.  Now we have 1/2^160 chance of false failure
    ;-).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. avoid asking ?alloc() for zero bytes.

    Junio C Hamano committed Dec 26, 2005
    Avoid asking for zero bytes when that change simplifies overall
    logic.  Later we would change the wrapper to ask for 1 byte on
    platforms that return NULL for zero byte request.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 26, 2005
  1. short circuit out of a few places where we would allocate zero bytes

    Eric Wong committed with Junio C Hamano Dec 24, 2005
    dietlibc versions of malloc, calloc and realloc all return NULL if
    they're told to allocate 0 bytes, causes the x* wrappers to die().
    
    There are several more places where these calls could end up asking
    for 0 bytes, too...
    
    Maybe simply not die()-ing in the x* wrappers if 0/NULL is returned
    when the requested size is zero is a safer and easier way to go.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 24, 2005
  1. GIT 1.0.4

    Junio C Hamano committed Dec 24, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. mailinfo: iconv does not like "latin-1" -- should spell it "latin1"

    Junio C Hamano committed Dec 24, 2005
    This was a stupid typo that did not follow
    
    	http://www.iana.org/assignments/character-sets
    
    Long noticed but neglected by JC, but finally reported by
    Marco.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 23, 2005
  1. ls-files --full-name: usage string and documentation.

    Junio C Hamano committed Dec 23, 2005
    Somehow this option was not mentioned anywhere in the
    documentation nor the usage string.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. merge --no-commit: tweak message

    Junio C Hamano committed Dec 23, 2005
    We did not distinguish the case the user asked not to make a
    commit with --no-commit flag and the automerge failed.  Tell
    these cases apart and phrase dying message differently.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. show-branch: usability updates.

    Junio C Hamano committed Dec 23, 2005
    This does three things:
    
     . It simplifies the logic to handle the case in which no
       refs are given on the command line, and fixes the bug
       when only "--heads" is specified.  Earlier we showed
       them twice.
    
     . It avoids to add the same ref twice.
    
     . It sorts the glob result (e.g. "git show-branch
       'tags/v1.0*'") according to a more version friendly
       sort order.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. check_packed_git_idx(): check integrity of the idx file itself.

    Junio C Hamano committed Dec 23, 2005
    Although pack-check.c had routine to verify the checksum for the
    pack index file itself, the core did not check it before using
    it.
    
    This is stolen from the patch to tighten packname requirements.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    (cherry picked from 797bd6f commit)
  5. GIT 1.0.3

    Junio C Hamano committed Dec 23, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 22, 2005
  1. sha1_to_hex: properly terminate the SHA1

    dscho committed with Junio C Hamano Dec 22, 2005
    sha1_to_hex() returns a pointer to a static buffer. Some of its users
    modify that buffer by appending a newline character. Other users rely
    on the fact that you can call
    
    	printf("%s", sha1_to_hex(sha1));
    
    Just to be on the safe side, terminate the SHA1 in sha1_to_hex().
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fix for http-fetch from file:// URLs

    Nick Hengeveld committed with Junio C Hamano Dec 22, 2005
    Recognize missing files when using http-fetch with file:// URLs
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-format-patch should show the correct version

    dscho committed with Junio C Hamano Dec 22, 2005
    We want to record the version of the tools the patch was generated with.
    While these tools could be rebuilt, git-format-patch stayed the same and
    report the wrong version.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. send-pack: reword non-fast-forward error message.

    Junio C Hamano committed Dec 22, 2005
    Wnen refusing to push a head, we said cryptic "remote 'branch'
    object X does not exist on local" or "remote ref 'branch' is not
    a strict subset of local ref 'branch'".  That was gittish.
    
    Since the most likely reason this happens is because the pushed
    head was not up-to-date, clarify the error message to say that
    straight, and suggest pulling first.
    
    First noticed by Johannes and seconded by Andreas.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. \n usage in stderr output

    raalkml committed with Junio C Hamano Dec 15, 2005
    fprintf and die sometimes have missing/excessive "\n" in their arguments,
    correct the strings where I think it would be appropriate.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. sanity check in add_packed_git()

    proski committed with Junio C Hamano Dec 21, 2005
    add_packed_git() tries to get the pack SHA1 by parsing its name.  It may
    access uninitialized memory for packs with short names.
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 21, 2005
  1. GIT 1.0.0b

    Junio C Hamano committed Dec 21, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. server-info: skip empty lines.

    Junio C Hamano committed Dec 21, 2005
    Now we allow an empty line in objects/info/packs file, recognize
    that and stop complaining.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. [PATCH] quote.c: Make loop control more readable.

    proski committed with Junio C Hamano Dec 21, 2005
    quote_c_style_counted() in quote.c uses a hard-to-read  construct.
    Convert this to a more traditional form of the for loop.
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. GIT 1.0.0a

    Junio C Hamano committed Dec 21, 2005
        - Avoid misleading success message on error (Johannes)
        - objects/info/packs: work around bug in http-fetch.c::fetch_indices()
        - http-fetch.c: fix objects/info/pack parsing.
        - An off-by-one bug found by valgrind (Pavel)
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. An off-by-one bug found by valgrind

    proski committed with Junio C Hamano Dec 21, 2005
    Insufficient memory is allocated in index-pack.c to hold the *.idx name.
    One more byte should be allocated to hold the terminating 0.
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Avoid misleading success message on error

    dscho committed with Junio C Hamano Dec 21, 2005
    When a push fails (for example when the remote head does not fast forward
    to the desired ref) it is not correct to print "Everything up-to-date".
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. http-fetch.c: fix objects/info/pack parsing.

    Junio C Hamano committed Dec 21, 2005
    It failed to register the last pack in the objects/info/packs
    file.  Also it had an independent overrun error.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. objects/info/packs: work around bug in http-fetch.c::fetch_indices()

    Junio C Hamano committed Dec 21, 2005
    The code to fetch pack index files in deployed clients have a
    bug that causes it to ignore the pack file on the last line of
    objects/info/packs file, so append an empty line to work it
    around.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. GIT 1.0.0

    Junio C Hamano committed Dec 21, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Make "git-send-pack" less verbose by default

    Linus Torvalds committed with Junio C Hamano Dec 21, 2005
    It used to make sense to have git-send-pack talk about the things it sent
    when (a) it was a new program and (b) nobody had a lot of tags and
    branches.
    
    These days, it's just distracting to see tons of
    
    	'refs/tags/xyz': up-to-date
    	...
    
    when updating a remote repo.
    
    So shut it up by default, and add a "--verbose" flag for those who really
    want to see it.
    
    Also, since this makes he case of everything being up-to-date just totally
    silent, make it say "Everything up-to-date" if no refs needed updating.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. A shared repository should be writable by members.

    Junio C Hamano committed Dec 21, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 20, 2005
  1. ce_smudge_racily_clean_entry: explain why it works.

    Junio C Hamano committed Dec 20, 2005
    This is a tricky code and warrants extra commenting.  I wasted
    30 minutes trying to break it until I realized why it works.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>