Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.4.2.3
Commits on Oct 2, 2006
  1. git-push: .git/remotes/ file does not require SP after colon

    Junio C Hamano authored
    Although most people would have one after colon if only for
    readability, we never required it in git-parse-remote, so let's
    not require one only in git-push.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-mv: invalidate the removed path properly in cache-tree

    Junio C Hamano authored
    The command updated the cache without invalidating the cache
    tree entries while removing an existing entry.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Sep 30, 2006
  1. git-diff -B output fix.

    Junio C Hamano authored
    Geert noticed that complete rewrite diff missed the usual a/ and b/
    leading paths.  Pickaxe says it never worked, ever.
    
    Embarrassing.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    (cherry picked from bc1a580 commit)
Commits on Sep 18, 2006
  1. Fix git-am safety checks

    Junio C Hamano authored
    An earlier commit cbd64af added a check that prevents "git-am"
    to run without its standard input connected to a terminal while
    resuming operation.  This was to catch a user error to try
    feeding a new patch from its standard input while recovery.
    
    The assumption of the check was that it is an indication that a
    new patch is being fed if the standard input is not connected to
    a terminal.  It is however not quite correct (the standard input
    can be /dev/null if the user knows the operation does not need
    any input, for example).  This broke t3403 when the test was run
    with its standard input connected to /dev/null.
    
    When git-am is given an explicit command such as --skip, there
    is no reason to insist that the standard input is a terminal; we
    are not going to read a new patch anyway.
    
    Credit goes to Gerrit Pape for noticing and reporting the
    problem with t3403-rebase-skip test.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Liu Yubao

    Fix duplicate xmalloc in builtin-add

    Dieken authored Junio C Hamano committed
    [jc: patch came without sign-off but it was too obvious and trivial.]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Sep 13, 2006
  1. http-fetch: fix alternates handling.

    Junio C Hamano authored
    Fetch over http from a repository that uses alternates to borrow
    from neighbouring repositories were quite broken, apparently for
    some time now.
    
    We parse input and count bytes to allocate the new buffer, and
    when we copy into that buffer we know exactly how many bytes we
    want to copy from where.  Using strlcpy for it was simply
    stupid, and the code forgot to take it into account that strlcpy
    terminated the string with NUL.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Aug 21, 2006
  1. dscho

    builtin-mv: readability patch

    dscho authored Junio C Hamano committed
    The old version was not liked at all. This is hopefully better. Oh, and it
    gets rid of the goto.
    
    Note that it does not change any functionality.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. dscho

    git-mv: fix off-by-one error

    dscho authored Junio C Hamano committed
    Embarassing.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. dscho

    git-mv: special case destination "."

    dscho authored Junio C Hamano committed
    Since the normalized basename of "." is "", the check for directory
    failed erroneously.
    
    Noticed by Fredrik Kuivinen.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Aug 16, 2006
  1. dscho

    [PATCH] git-mv: add more path normalization

    dscho authored Junio C Hamano committed
    We already use the normalization from get_pathspec(), but now we also
    remove a trailing slash. So,
    
    	git mv some_path/ into_some_path/
    
    works now.
    
    Also, move the "can not move directory into itself" test before the
    subdirectory expansion.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. finish_connect(): thinkofix

    Junio C Hamano authored
    All but one callers have ignore the return value from this
    function, but the only caller, builtin-tar-tree.c::remote_tar(),
    assumed it returns non-zero on failure and zero on success.  The
    implementation however was returning either the waited pid
    (which must be the same as its input) or -1 (an error).
    
    Fix this thinko, while getting rid of an assignment of return
    value from waitpid() into a variable of type int.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. dscho

    git-mv: succeed even if source is a prefix of destination

    dscho authored Junio C Hamano committed
    As noted by Fredrik Kuivinen, without this patch, git-mv fails on
    
    	git-mv README README-renamed
    
    because "README" is a prefix of "README-renamed".
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Aug 15, 2006
  1. dstosberg

    Solaris does not support C99 format strings before version 10

    dstosberg authored Junio C Hamano committed
    Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Aug 13, 2006
  1. Luben Tuikov

    sample commit-msg hook: no silent exit on duplicate Signed-off-by lines

    ltuikov authored Junio C Hamano committed
    git-commit would silently exit if duplicate Signed-off-by
    lines were found.  Users of git-commit would not know it,
    unless they checked '$?'.  This patch makes git-commit
    actually print out a message that nothing was commited
    since duplicate Signed-off-lines were found.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Luben Tuikov

    Fix regex pattern in commit-msg

    ltuikov authored Junio C Hamano committed
    Between the count and the line output, some
    uniq(1) versions put a TAB character, not a space.
    Make sure both are handled.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. GIT 1.4.2

    Junio C Hamano authored
  4. Merge git://git.kernel.org/pub/scm/gitk/gitk

    Junio C Hamano authored
    * 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
  5. t/t4013: fix futzing with the version string.

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Better error message when we are unable to lock the index file

    Junio C Hamano authored
    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>
  7. git-am: give better diagnostics when the patch does not apply during …

    Junio C Hamano authored
    …--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>
Commits on Aug 12, 2006
  1. Merge branch 'rj/header'

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

    Eric Wong authored Junio C Hamano committed
    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>
  3. git-sh-setup: do not use repo-config to test the git directory

    Junio C Hamano authored
    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>
Commits on Aug 11, 2006
  1. git-svn: bugfix: allow SVN:: lib users to track the root of the repos…

    Eric Wong authored Junio C Hamano committed
    …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>
  2. git-svn: correctly kill keyword expansion without munging EOLs

    Eric Wong authored Junio C Hamano committed
    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>
  3. drop length argument of has_extension

    Rene Scharfe authored Junio C Hamano committed
    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>
  4. Merge branch 'rn/push-dav'

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

    Rutger Nijlunsing authored Junio C Hamano committed
    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>
  2. git-verify-pack: no need to count errors

    Rene Scharfe authored Junio C Hamano committed
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-verify-pack: buffer overrun paranoia

    Rene Scharfe authored Junio C Hamano committed
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-verify-pack: free pack after use and a cleanup

    Rene Scharfe authored Junio C Hamano committed
    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>
  5. git-verify-pack: get rid of while loop

    Rene Scharfe authored Junio C Hamano committed
    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>
  6. git-verify-pack: insist on .idx extension

    Rene Scharfe authored Junio C Hamano committed
    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>
  7. git-verify-pack: more careful path handling

    Rene Scharfe authored Junio C Hamano committed
    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>
  8. git-verify-pack: show usage when no pack was specified

    Rene Scharfe authored Junio C Hamano committed
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Something went wrong with that request. Please try again.