Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.4.3.5

Nov 12, 2006

  1. git-cvsserver: read from git with -z to get non-ASCII pathnames.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 10, 2006

Nov 11, 2006

  1. 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>
    authored November 11, 2006

Nov 09, 2006

  1. git-rebase: Use --ignore-if-in-upstream option when executing git-for…

    …mat-patch.
    
    This reduces the number of conflicts when rebasing after a series of
    patches to the same piece of code is committed upstream.
    
    Signed-off-by: Robert Shearman <rob@codeweavers.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 03, 2006 Junio C Hamano committed November 09, 2006
  2. git-svn: fix dcommit losing changes when out-of-date from svn

    There was a bug in dcommit (and commit-diff) which caused deltas
    to be generated against the latest version of the changed file
    in a repository, and not the revision we are diffing (the tree)
    against locally.
    
    This bug can cause recent changes to the svn repository to be
    silently clobbered by git-svn if our repository is out-of-date.
    
    Thanks to Steven Grimm for noticing the bug.
    
    The (few) people using the commit-diff command are now required
    to use the -r/--revision argument.  dcommit usage is unchanged.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 09, 2006 Junio C Hamano committed November 09, 2006
  3. git-svn: don't die on rebuild when --upgrade is specified

    --copy-remote and --upgrade are rarely (never?) used together,
    so if --copy-remote is specified, that means the user really
    wanted to copy the remote ref, and we should fail if that fails.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 04, 2006 Junio C Hamano committed November 09, 2006
  4. git-svn: avoid printing filenames of files we're not tracking

    This is purely an aesthetic change, we already skip importing of
    files that don't affect the subdirectory we import.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 04, 2006 Junio C Hamano committed November 09, 2006
  5. Nicer error messages in case saving an object to db goes wrong

    Currently the error e.g. when pushing to a read-only repository is quite
    confusing, this attempts to clean it up, unifies error reporting between
    various object writers and uses error() on couple more places.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 09, 2006 Junio C Hamano committed November 09, 2006

Nov 07, 2006

  1. remove an unneeded test

    In wt-status.c there is a test which does nothing.
    This patch removes it.
    
    Signed-off-by: Tero Roponen <teanropo@jyu.fi>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 07, 2006 Junio C Hamano committed November 07, 2006

Nov 06, 2006

  1. Jakub Narębski

    Documentation: Transplanting branch with git-rebase --onto

    Added example of transplantig feature branch from one development
    branch (for example "next") into the other development branch (for
    example "master").
    
    [jc: talking Carl's advice this contains both examples sent to
     the list by Jakub in his original message.]
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 06, 2006 Junio C Hamano committed November 06, 2006
  2. merge-recursive implicitely depends on trust_executable_bit

    Read the configuration in to get core.filemode value for this
    particular repository.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 06, 2006 Junio C Hamano committed November 06, 2006
  3. adjust_shared_perm: chmod() only when needed.

    When widening permission for files and directories in a 'shared'
    repository for a user with inappropriate umask() setting for
    shared work, make sure we call chmod() only when we actually
    need to.
    
    The primary idea owes credit to Johannes.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 04, 2006
  4. Jeff King

    Fix git-runstatus for repositories containing a file named HEAD

    The wt_status_print_updated() and wt_status_print_untracked() routines
    call setup_revisions() with 'HEAD' being the reference to the tip of the
    current branch. However, setup_revisions() gets confused if the branch
    also contains a file named 'HEAD' resulting in a fatal error.
    
    Instead, don't pass an argv to setup_revisions() at all; simply give it no
    arguments, and make 'HEAD' the default revision.
    
    Bug noticed by Rocco Rutte <pdmef@gmx.net>.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 05, 2006 Junio C Hamano committed November 05, 2006

Nov 05, 2006

  1. Shawn O. Pearce

    Remove unsupported C99 style struct initializers in git-archive.

    At least one older version of the Solaris C compiler doesn't support
    the newer C99 style struct initializers.  To allow Git to compile
    on those systems use an archive description struct which is easier
    to initialize without the C99 struct initializer syntax.
    
    Also since the archives array is not used by anyone other than
    archive.c we can make it static.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 05, 2006 Junio C Hamano committed November 04, 2006
  2. Shawn O. Pearce

    Remove SIMPLE_PROGRAMS and make git-daemon a normal program.

    Some platforms (Solaris in particular) appear to require -lz as
    part of the link line for git-daemon, due to it linking against
    sha1_file.o and that module requiring inflate/deflate support.
    
    So its time to retire SIMPLE_PROGRAMS and move its last remaining
    member into the standard PROGRAMS list, allowing it to link against
    all libraries used by the rest of Git.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 05, 2006 Junio C Hamano committed November 04, 2006
  3. Shawn O. Pearce

    Use ULONG_MAX rather than implicit cast of -1.

    At least one (older) version of the Solaris C compiler won't allow
    'unsigned long x = -1' without explicitly casting -1 to a type of
    unsigned long.  So instead use ULONG_MAX, which is really the
    correct constant anyway.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 05, 2006 Junio C Hamano committed November 04, 2006

Nov 04, 2006

  1. apply: handle "traditional" creation/deletion diff correctly.

    We deduced a GNU diff output that does not use /dev/null convention
    as creation (deletion) diff correctly by looking at the lack of context
    and deleted lines (added lines), but forgot to reset the new (old) name
    field properly.
    
    This was a regression when we added a workaround for --unified=0 insanity.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 04, 2006

Nov 03, 2006

  1. Andy Parkins

    git-clone documentation didn't mention --origin as equivalent of -o

    Signed-off-by: Andy Parkins <andyparkins@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 02, 2006 Junio C Hamano committed November 02, 2006
  2. Andy Parkins

    Minor grammar fixes for git-diff-index.txt

    "what you are going to commit is" doesn't need the "is" and does need a comma.
    
    "can trivially see" is an unecessary split infinitive and "easily" is a more
    appropriate adverb.
    
    Signed-off-by: Andy Parkins <andyparkins@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 02, 2006 Junio C Hamano committed November 02, 2006
  3. dscho

    link_temp_to_file: call adjust_shared_perm() only when we created the…

    … directory
    authored November 02, 2006 Junio C Hamano committed November 02, 2006

Nov 01, 2006

  1. pack-objects doesn't create random pack names

    Documentation for pack-objects seems to be out of date in this regard.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored November 01, 2006 Junio C Hamano committed November 01, 2006

Oct 31, 2006

  1. link_temp_to_file: don't leave the path truncated on adjust_shared_pe…

    …rm failure
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 31, 2006
  2. revision traversal: --unpacked does not limit commit list anymore.

    This is needed to gain smaller latency back.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 30, 2006
  3. Jan Harkes

    Continue traversal when rev-list --unpacked finds a packed commit.

    When getting the list of all unpacked objects by walking the commit history,
    we would stop traversal whenever we hit a packed commit. However the fact
    that we found a packed commit does not guarantee that all previous commits
    are also packed. As a result the commit walkers did not show all reachable
    unpacked objects.
    
    Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 30, 2006 Junio C Hamano committed October 30, 2006
  4. Use memmove instead of memcpy for overlapping areas

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 30, 2006 Junio C Hamano committed October 30, 2006
  5. quote.c: ensure the same quoting across platforms.

    We read a byte from "char *" and compared it with ' ' to decide
    if it needs quoting to protect textual output.  With a platform
    where char is unsigned char that would give different result.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 30, 2006

Oct 30, 2006

  1. Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"

    Otherwise "make CFLAGS=-DDEBUG=1" is cumbersome to run.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 30, 2006

Oct 27, 2006

  1. Jakub Narębski

    gitweb: Check git base URLs before generating URL from it

    Check if each of git base URLs in @git_base_url_list is true before
    appending "/$project" to it to generate project URL.
    
    This fixes the error that for default configuration for gitweb in
    Makefile, with GITWEB_BASE_URL empty (and "++GITWEB_BASE_URL++" being
    "" in gitweb.cgi), we had URL of "/$project" in the summary view.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 26, 2006 Junio C Hamano committed October 27, 2006
  2. Christian Couder

    Documentation: add git in /etc/services.

    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 27, 2006 Junio C Hamano committed October 27, 2006
  3. Christian Couder

    Documentation: add upload-archive service to git-daemon.

    This patch minimaly documents the upload-archive service,
    hoping that someone with better knowledge will improve upon.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 27, 2006 Junio C Hamano committed October 27, 2006
  4. git-cherry: document limit and add diagram

    This patch adds the diagram from the long usage string of git-cherry to
    its documentation, and documents the third option.  I changed some of
    the + to - in order to save the reader from wondering where they might
    fit into the picture.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 26, 2006 Junio C Hamano committed October 26, 2006
  5. Merge branch 'jc/combined' into maint

    * jc/combined:
      combine-diff: honour --no-commit-id
      combine-diff: fix hunk_comment_line logic.
      combine-diff: a few more finishing touches.
    authored October 26, 2006
  6. Jakub Narębski

    diff-format.txt: Correct information about pathnames quoting in patch…

    … format
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 26, 2006 Junio C Hamano committed October 26, 2006

Oct 26, 2006

  1. combine-diff: honour --no-commit-id

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 26, 2006
  2. combine-diff: fix hunk_comment_line logic.

    We forgot that the last element of sline[] is a sentinel without
    the actual line.  *BLUSH*
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 26, 2006
  3. combine-diff: a few more finishing touches.

    "new file" and "deleted file" were already reported in the
    original code, but the logic was not as transparent as it could
    have.  This uses a few variables and more comments to clarify
    the flow.  The rule is: (1) if a path exists in the merge result
    when no parent had it, we report "new" (otherwise it came from
    the parents, as opposed to have added by the evil merge). (2) if
    the path does not exist in the merge result, it is "deleted".
    
    Since we can say "new" and "deleted", there is no reason not to
    follow the /dev/null convention.  This fixes it.
    
    Appending function name after @@@ ... @@@ is trivial, so
    implement it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored October 26, 2006
Something went wrong with that request. Please try again.