Permalink
Commits on Aug 13, 2006
  1. GIT 1.4.2

    Junio C Hamano committed Aug 13, 2006
  2. Merge git://git.kernel.org/pub/scm/gitk/gitk

    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Show the currently checked-out head in bold font
      gitk: Allow the user to set some colors
    Junio C Hamano committed Aug 13, 2006
  3. t/t4013: fix futzing with the version string.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 13, 2006
  4. Better error message when we are unable to lock the index file

    Most of the callers except the one in refs.c use the function to
    update the index file.  Among the index writers, everybody
    except write-tree dies if they cannot open it for writing.
    
    This gives the function an extra argument, to tell it to die
    when it cannot create a new file as the lockfile.
    
    The only caller that does not have to die is write-tree, because
    updating the index for the cache-tree part is optional and not
    being able to do so does not affect the correctness.  I think we
    do not have to be so careful and make the failure into die() the
    same way as other callers, but that would be a different patch.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 12, 2006
  5. git-am: give better diagnostics when the patch does not apply during …

    …--3way
    
    If the user tries to apply a patch that was hand-edited in such
    a way that it does not apply to the original file recorded on
    its "index" line anymore, we did detect the situation but did
    not issue an error message that is specific enough.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 12, 2006
Commits on Aug 12, 2006
  1. Merge branch 'rj/header'

    * rj/header:
      Fix header breakage with _XOPEN_SOURCE.
    Junio C Hamano committed Aug 12, 2006
  2. git-svn: split the path from the url correctly with limited perms

    This version of the splitter (that only affects SVN:: library
    users) works when one only has limited read-permissions to
    the repository they're fetching from.
    
    Updated from the original patch to workaround some SVN bug
    somewhere, which only seems to happen against file://
    repositories...  Here's the diff against the original patch I
    submitted:
    
    @@ -1159,8 +1159,8 @@ sub repo_path_split {
     	}
    
     	if ($_use_lib) {
    -		$SVN = libsvn_connect($full_url);
    -		my $url = $SVN->get_repos_root;
    +		my $tmp = libsvn_connect($full_url);
    +		my $url = $tmp->get_repos_root;
     		$full_url =~ s#^\Q$url\E/*##;
     		push @repo_path_split_cache, qr/^(\Q$url\E)/;
     		return ($url, $full_url);
    
    Somehow connecting to a repository with the full url makes the
    returned SVN::Ra object act strangely and break things, so now
    we just drop the SVN::Ra object that we made our initial
    connection with.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Aug 12, 2006
  3. git-sh-setup: do not use repo-config to test the git directory

    Since repo-config does not fail in non-git directory, it is not
    a good command to use to test the git-ness nor validate the
    repository revision of $GIT_DIR.
    
    Original patch by Robert Shearman but with minor fixes.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 12, 2006
Commits on Aug 11, 2006
  1. git-svn: bugfix: allow SVN:: lib users to track the root of the repos…

    …itory
    
    I'm not sure if anybody has hit this (besides me), but this
    fixes the problem where I ran into while attempting to import a
    small repo at the root level:  I ended up with all the commits, but
    with no file/tree changes at all throughout the entire history.
    
    Also, fix a warning if the commit message is not defined for revision 0.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Aug 11, 2006
  2. git-svn: correctly kill keyword expansion without munging EOLs

    This bugfix applies to users of the svn command-line client only.
    
    We no longer muck with newlines when killing keyword expansion.
    This tended to generate unintended diffs in commits because svn
    revert -R would destroy the manual EOL changes we were doing. Of
    course, we didn't need the EOL munging in the first place, as
    svn seems to do it for us even in the text-base files.
    
    Now we set the mtime and atime the files changed by keyword
    expansion killing to avoid triggering a change on svn revert,
    which svn still seems to want to do.
    
    Thanks to Seth Falcon for reporting this bug.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Aug 11, 2006
  3. drop length argument of has_extension

    As Fredrik points out the current interface of has_extension() is
    potentially confusing.  Its parameters include both a nul-terminated
    string and a length-limited string.
    
    This patch drops the length argument, requiring two nul-terminated
    strings; all callsites are updated.  I checked that all of them indeed
    provide nul-terminated strings.  Filenames need to be nul-terminated
    anyway if they are to be passed to open() etc.  The performance penalty
    of the additional strlen() is negligible compared to the system calls
    which inevitably surround has_extension() calls.
    
    Additionally, change has_extension() to use size_t inside instead of
    int, as that is the exact type strlen() returns and memcmp() expects.
    
    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 Aug 11, 2006
  4. Merge branch 'rn/push-dav'

    * rn/push-dav:
      http-push: Make WebDAV work with (broken?) default apache2 WebDAV module
    Junio C Hamano committed Aug 11, 2006
Commits on Aug 10, 2006
  1. Add Documentation/howto/setup-git-server-over-http.txt

    A small howto on how to setup GIT over HTTP transport protocol by
    setting up WebDAV access on apache2.
    
    [jc: minimum ispell fixes applied]
    
    Signed-off-by: Rutger Nijlunsing <git@tux.tmfweb.nl>
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rutger Nijlunsing committed with Junio C Hamano Aug 10, 2006
  2. git-verify-pack: no need to count errors

    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 Aug 10, 2006
  3. git-verify-pack: buffer overrun paranoia

    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 Aug 10, 2006
  4. git-verify-pack: free pack after use and a cleanup

    Plug memory leak in verify_one_pack() by freeing the struct packed_git
    we got from add_packed_git().  Also rename g to pack and pull an
    assignment out of an if statement while we're at it.
    
    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 Aug 10, 2006
  5. git-verify-pack: get rid of while loop

    Get rid of that while loop which was apparently used as a way to avoid
    goto's (why?).  It's easy now because there is only one break left at
    the end of it.  Also make the comment clearer.
    
    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 Aug 10, 2006
  6. git-verify-pack: insist on .idx extension

    git-verify-pack can be called with a filename without .idx extension.
    add_packed_git() on the other hand depends on its presence.  So
    instead of trying to call it with whatever the user gave us check for
    that extension and add it if it's missing.
    
    That means that you can't name your index file "blah" and your pack
    file ".pack" anymore ("git-verify-pack blah" currently works in that
    case).  I think this regression is a good change. ;-)
    
    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 Aug 10, 2006
  7. git-verify-pack: more careful path handling

    Use strlcpy() to copy the filename into a buffer and complain if it
    doesn't fit.  Also move the path buffer into verify_one_pack(); it is
    used only there.  Now we can const'ify the first argument of this
    function.
    
    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 Aug 10, 2006
  8. git-verify-pack: show usage when no pack was specified

    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 Aug 10, 2006
  9. Add has_extension()

    The little helper has_extension() documents through its name what we are
    trying to do and makes sure we don't forget the underrun check.
    
    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 Aug 10, 2006
  10. builtin-apply: remove unused increment

    We do not use desc.alloc after assigning desc.buffer to patch->result;
    do not bother to increment it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 10, 2006
  11. Fix git-diff A...B

    Commit 9919f41 meant to make git-diff A...B to (usually) mean
    "git-diff `git-merge-base A B` B", but it got the parameters wrong
    and ended up showing "git-diff `git-merge-base A B` A" by mistake.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 10, 2006
  12. combine-diff: use color

    Using the same mechanism as the regular diffs, color combined diff
    output.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 10, 2006
  13. http-push: Make WebDAV work with (broken?) default apache2 WebDAV module

    WebDAV on Debian unstable cannot handle renames on WebDAV from
    file.ext to newfile (without ext) when newfile* already
    exists. Normally, git creates a file like 'objects/xx/sha1.token',
    which is renamed to 'objects/xx/sha1' when transferred completely.
    
    Just use '_' instead of '.' so WebDAV doesn't see it as an extension
    change.
    
    Signed-off-by: Rutger Nijlunsing <git@tux.tmfweb.nl>
    Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rutger Nijlunsing committed with Junio C Hamano Aug 9, 2006
  14. git-apply: applying a patch to make a symlink shorter.

    The internal representation of the result is counted string
    (i.e. char *buf and ulong size), which is fine for writing out
    to regular file, but throwing the buf at symlink(2) was a
    no-no.
    
    Reported by Willy Tarreau.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 10, 2006
Commits on Aug 9, 2006
  1. allow diff.renamelimit to be set regardless of -M/-C

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 9, 2006
  2. make --find-copies-harder imply -C

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 9, 2006
  3. find_unique_abbrev() with len=0 should not abbreviate

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 9, 2006
  4. check return value from diff_setup_done()

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 9, 2006
  5. Fix tutorial-2.html

    Honza Pazdziora noticed that one example did not match reality.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 9, 2006
  6. Documentation: git-status takes the same options as git-commit

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 8, 2006
  7. Update git-init-db(1) and documentation of core.sharedRepository

    Combine option descriptions in git-init-db(1). Reflect the changes to
    additionally allow all users to read the created git repository.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jonas committed with Junio C Hamano Aug 9, 2006
Commits on Aug 8, 2006
  1. git-push: allow pushing from subdirectories

    The semantics are equivalent to pushing from the root; we just try harder to
    find the .git directory.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    peff committed with Junio C Hamano Aug 8, 2006
  2. GIT-VERSION-GEN: adjust for ancient git

    When an ancient "git" that does not understand "describe"
    command is on the $PATH, "git describe" emitted a Usage message
    without exiting non-zero status (which is a mistake we cannot
    fix retroactively).  Catch this case to make sure we do not try
    using phoney multi-line string as a version number.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Aug 8, 2006