Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v0.99.9k

Nov 26, 2005

  1. GIT 0.99.9k

    This is not 1.0rc4 yet, but to push the recent fixes out.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored

Nov 25, 2005

  1. git-sh-setup: move the repository check to a core program.

    Any core commands that use setup_git_directory() now check if
    given GIT_DIR is really a valid repository, so the same check in
    git-sh-setup can use it without reimplementing it in shell.
    This commit changes git-sh-setup to use git-var command for
    that, although any other commands would do.
    
    Note that we export GIT_DIR explicitly when calling git-var;
    without it, the caller of this script would use GIT_DIR that we
    return (which is to assume ./.git unless the caller has it
    elsewhere) while git-var would go up to find a .git directory in
    our parent directories, which would be checking a different
    directory from what our callers will be using.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  2. setup_git_directory: make sure GIT_DIR is a valid repository.

    setup_git_directory() always trusted what the user told where
    GIT_DIR was, and assumed that is a valid .git/ directory.  This
    commit changes it to at least do the same level validation as
    is_toplevel_directory() does -- has refs/, has objects/ unless
    GIT_OBJECT_DIRECTORY is set, and has valid HEAD symlink or
    symref.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  3. git-var: make it work in subdirectory.

    Use setup_git_directory() so that it can find its .git
    directory.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  4. git-sh-setup: die if outside git repository.

    Now all the users of this script detect its exit status and die,
    complaining that it is outside git repository.  So move the code
    that dies from all callers to git-sh-setup script.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  5. parse-remote and ls-remote clean-up.

    There is no reason to use git-sh-setup from git-ls-remote.
    git-parse-remote can help the caller to use .git/remotes
    shortcut if it is run inside a git repository, but can still be
    useful outside a git repositoryas long as the caller does not
    use any shortcut.  Use "git-rev-parse --git-dir" to figure out
    where the GIT_DIR is, instead of using git-sh-setup.
    
    This also makes "git-ls-remote origin" to work from inside a
    subdirectory of a git managed repository as a side effect.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  6. Prevent "git-commit -a path1 path2..."

    When you want to create a partial commit, giving -a by mistake
    would ignore the given path.  Prevent it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  7. config.c: avoid shadowing global.

    This is purely cosmetic, but avoid shadowing "FILE *config_file"
    global in git_config_set_multivar() function.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  8. Fix a warning about unused value.

    Fix a warning:
      git.c:276: warning: value computed is not used
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    YOSHIFUJI Hideaki / 吉藤英明 authored Junio C Hamano committed
  9. cvsimport: Don't let local settings hinder cvs user-migration.

    Avoid this by passing "--norc" to cvsps.
    
    Signed-off-by: Andreas Ericsson <ae@op5.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Andreas Ericsson authored Junio C Hamano committed

Nov 24, 2005

  1. dscho

    Rename git-config-set to git-repo-config

    ... and adjust all references.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho authored Junio C Hamano committed
  2. diff-tree: teach single-commit diff-tree to honour grafts

    We used to read the commit objects by hand and ignored the grafts.
    Rewrite it using lookup_commit() API, to make it grafts-aware.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  3. Teach update-index to read from ls-tree.

    git-update-index --index-info can almost be usable to read from ls-tree
    output to update the index (and not the working tree file) to HEAD commit,
    but not quite.  It was designed to read from git-apply --index-info
    output, and does not want " blob " in ls-tree output.  Accept that as well.
    
    This lets us update "git-checkout <ent> <path>" that used to filter the
    extra " blob " string out.  Noted by Luben.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  4. git-revert: make --edit default.

    Revert always should explain why, so make --edit the default,
    unless stdin is not a terminal.  If you really don't want to say
    anything, you can say "git-revert --no-edit $commit", or if you
    are really sick, you could also say "git-revert $commit </dev/null".
    But please don't.
    
    You can also say "git-cherry-pick --edit $commit".  Not editting
    the commit log message is the default for cherry-pick.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  5. Allow editing of a revert-message

    I think all commit operations should allow editing of the message (ie we
    should do this for merges too), but that's _particularly_ true of doing a
    "git revert".
    
    We should always explain why we needed to revert something.
    
    This patch adds a "-e" or "--edit" flag to "git revert", although I
    actually suspect it should be on by default (and we should have a
    "--no-edit" flag to disable it, probably together with an automatic
    disable if stdin isn't a terminal).
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds authored Junio C Hamano committed
  6. weidendo

    Fix git-mv for moving directories with 1 file

    This is fixed by putting the file into @changedfiles/@addedfiles,
    and not the directory this file is in.
    
    Additionally, this fixes the behavior for attempting to overwrite
    a file with a directory, and gives a message for all cases where
    overwriting is not possible (file->dir,dir->file,dir->dir).
    
    Thanks for Alexander Litvinov for noting this problem.
    
    Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    weidendo authored Junio C Hamano committed
  7. git-merge: make recursive the default strategy

    git-pull invoked merge with recursive as the default strategy
    for some time now; match it in the git-merge itself.  Also avoid
    listing more than one strategy on default because we have only
    one strategy that can resolve an octopus and we are already
    counting heads here.  This reduces the need to stash away local
    modifications.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  8. pack-redundant: type cleanups.

    Binary representation of object names are unsigned char[20], not
    signed.  Also verbose output had %lu format printing size_t
    without (unsigned long) cast other places already had, so match
    that.  Using format %zu was suggested but might not be supported
    as widely.
    
    Noted by Morten Welinder, fixed with input from H. Peter Anvin
    and Hideaki Yoshifuji.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored

Nov 22, 2005

  1. Fixed git:// IPv4 address problem when compiled with -DNO_IPV6.

    Failure to dereference a pointer caused incorrect initialization of
    the IPv4 address when calling connect() when compiled with -DNO_IPV6.
    
    With this patch and yesterday's patch for git-daemon, it should now be
    possible to use the native git protocol for both the client and server
    on Cygwin.
    
    Signed-off-by: Paul Serice <paul@serice.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Paul Serice authored Junio C Hamano committed
  2. Alex Riesen

    arguments cleanup and some formatting

    Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    raalkml authored Junio C Hamano committed
  3. Alex Riesen

    remove unused variable

    It is just assigned, nothing more.
    
    Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    raalkml authored Junio C Hamano committed
  4. Alex Riesen

    speedup allocation in pack-redundant.c

    Reuse discarded nodes of llists
    
    Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    raalkml authored Junio C Hamano committed
  5. Make git-pack-redundant take a list of unimportant objs on stdin

    This lets us do "git-fsck-objects --full --unreachable | cut -d ' ' -f3 |
    git-pack-redundant --all", which will keep git-pack-redundant from keeping
    packs just because they contain unreachable objects.
    
    Also add some more --verbose output.
    
    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Lukas Sandström authored Junio C Hamano committed
  6. Merge http://www.kernel.org/pub/scm/gitk/gitk

    Junio C Hamano authored
  7. git-var: constness and globalness cleanup.

    var.c::git_var read function did not have to return writable
    strings; make it and the functions it points at return const char *
    instead.
    
    ident.c::get_ident() did not need to be global, so make it
    static.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  8. Move diff.renamelimit out of default configuration.

    Otherwise we would end up linking all the unneeded stuff into git-daemon
    only to link with git_default_config.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  9. Luben Tuikov

    max-count in terms of intersection

    When a path designation is given, max-count counts the number
    of commits therein (intersection), not globally.
    
    This avoids the case where in case path has been inactive
    for the last N commits, --max-count=N and path designation
    at git-rev-list is given, would give no commits.
    
    Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ltuikov authored Junio C Hamano committed
  10. GIT: Fix compilation error in connect.c

    Fix compilation error for gcc-2.95.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    YOSHIFUJI Hideaki / 吉藤英明 authored Junio C Hamano committed
  11. Andreas Ericsson

    Introduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.

    Remove $(SIMPLE_PROGRAMS) from $(PROGRAMS) so buildrules don't have
    to be overridden.
    
    Put $(SCRIPTS) with the other target-macros so it doesn't get lonely.
    
    Signed-off-by: Andreas Ericsson <ae@op5.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ageric authored Junio C Hamano committed

Nov 21, 2005

  1. rename/copy score parsing updates.

    Better variant, which handles stuff like "4.5%" and rejects
    "192.168.0.1".  Additionally, make sure numbers are unsigned (I'm making
    them unsigned long just for the hell of it), to make sure that
    artificial wraparound scenarios don't cause harm.
    
    	-hpa
    
    [jc: with this, -M100 changes its meaning back to 10%.  People
    wanting to say "pure renames only" should now say -M100% or
    -M1.0; sounds a bit like an earthquake, but arguably things are
    more consistent this way ;-)]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    H. Peter Anvin authored Junio C Hamano committed
  2. git-daemon not listening when compiled with -DNO_IPV6

    git-daemon was not listening when compiled with -DNO_IPV6.
    socksetup() was not returning socket count when compiled with -DNO_IPV6.
    
    Signed-off-by: Paul Serice <paul@serice.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Paul Serice authored Junio C Hamano committed
  3. git-repack: Properly abort in corrupt repository

    In a corrupt repository, git-repack produces a pack that does not
    contain needed objects without complaining, and the result of this
    combined with -d flag can be very painful -- e.g. a lossage of one
    tree object can lead to lossage of blobs reachable only through that
    tree.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds authored Junio C Hamano committed
  4. dscho

    Allow hierarchical section names

    A .git/config like follows becomes valid with this patch:
    
    	[remote.junio]
    		url = git://git.kernel.org/pub/scm/git/git.git
    		pull = master:junio todo:todo +pu:pu
    
    	[remote.ibook]
    		url = ibook:git/
    		pull = master:ibook
    		push = master:quetzal
    
    (This patch only does the ini file thing, git-fetch and friends still
    ignore these values).
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho authored Junio C Hamano committed
  5. dscho

    git-config-set: Properly terminate strings with '\0'

    When a lowercase version of the key was generated, it was not
    terminated. Strangely enough, it worked on Linux and macosx anyway.
    Just cygwin barfed.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho authored Junio C Hamano committed
  6. git-proxy updates.

    This builds on top of the git-proxy mechanism Paul Collins did,
    and updates its configuration mechanism.
    
     * GIT_PROXY_COMMAND environment variable is used as the
       catch-all fallback, as in the original.  This has not
       changed.
    
     * Renames proxy configuration variables to core.gitproxy; this
       has become a multi-value variable per list discussion, most
       notably from suggestion by Linus.
    
    	[core]
    	;# matches www.kernel.org as well
    	gitproxy = netcatter for kernel.org
    	gitproxy = netscatter for sample.xz
    	gitproxy = none for mydomain.xz
    	gitproxy = netcatter-default
    
       The values are command names, followed by an optional " for "
       and domainname; the first tail-match of the domainname
       determines which proxy command is used.  An entry without "
       for " matches any domain and can be used as the default.
    
       The command name "none" is special -- it tells the mechanism
       not to use any proxy command and use the native git://
       connection.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
Something went wrong with that request. Please try again.