Commits on Feb 26, 2007
  1. GIT 1.5.0.2

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 25, 2007
  2. @proski

    git-remote: support remotes with a dot in the name

    [jc: the original from Pavel was limiting the variable names to only
     fetch and url, but I loosened it to take valid variable names.]
    [jc: cherry-picked from 'master', since people seem to be reinventing
     this many times.]
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    proski committed with Junio C Hamano Feb 21, 2007
  3. Documentation: describe "-f/-t/-m" options to "git-remote add"

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 25, 2007
  4. diff --cc: fix display of symlink conflicts during a merge.

    "git-diff-files --cc" to show conflicts during merge did not pass
    the correct mode information for the working tree down, and showed
    bogus combined diff.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 25, 2007
  5. Merge branch 'jc/merge-symlink' into maint

    * jc/merge-symlink:
      merge-recursive: fix longstanding bug in merging symlinks
      merge-index: fix longstanding bug in merging symlinks
    Junio C Hamano committed Feb 25, 2007
  6. merge-recursive: fix longstanding bug in merging symlinks

    Commit 3af244c added unlink(2) before running symlink(2) to
    update the working tree with the merge result, but it was
    unlinking a wrong path.  This resulted in loss of the path
    pointed by a symlink.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 25, 2007
  7. merge-index: fix longstanding bug in merging symlinks

    Ancient commit e2b6a9d added code to pass "file modes" from
    merge-index to merge-one-file, and then later commit 54dd99a
    wanted to make sure we do not end up creating a nonsense symlink
    that points at a path whose name contains conflict markers.
    
    However, nobody noticed that the code in merge-index added by
    e2b6a9d were stripping the S_IFMT bits and the code in 54dd99a
    was meaningless.  This fixes it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 25, 2007
Commits on Feb 25, 2007
  1. Add Release Notes to prepare for 1.5.0.2

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 25, 2007
  2. @rolandd

    Allow arbitrary number of arguments to git-pack-objects

    If a repository ever gets in a situation where there are too many
    packs (more than 60 or so), perhaps because of frequent use of
    git-fetch -k or incremental git-repack, then it becomes impossible to
    fully repack the repository with git-repack -a.  That command just
    dies with the cryptic message
    
        fatal: too many internal rev-list options
    
    This message comes from git-pack-objects, which is passed one command
    line option like --unpacked=pack-<SHA1>.pack for each pack file to be
    repacked.  However, the current code has a static limit of 64 command
    line arguments and just aborts if more arguments are passed to it.
    
    Fix this by dynamically allocating the array of command line
    arguments, and doubling the size each time it overflows.
    
    Signed-off-by: Roland Dreier <roland@digitalvampire.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    rolandd committed with Junio C Hamano Feb 25, 2007
  3. rerere: do not deal with symlinks.

    Who would use multi-line symlinks that would benefit from rerere?
    Just ignore them.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 25, 2007
  4. rerere: do not skip two conflicted paths next to each other.

    The code forgot to take the for (;;) loop control into account,
    incrementing the index once too many.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 25, 2007
  5. Merge git://repo.or.cz/git-gui into maint

    * git://repo.or.cz/git-gui:
      Don't modify CREDITS-FILE if it hasn't changed.
    Junio C Hamano committed Feb 24, 2007
  6. @spearce

    Don't modify CREDITS-FILE if it hasn't changed.

    We should always avoid rewriting a built file during `make install`
    if nothing has changed since `make all`.  This is to help support
    the typical installation process of compiling a package as yourself,
    then installing it as root.
    
    Forcing CREDITS-FILE to be always be rebuilt in the Makefile means
    that CREDITS-GEN needs to check for a change and only update
    CREDITS-FILE if the file content actually differs.  After all,
    content is king in Git.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Junio C Hamano committed with spearce Feb 25, 2007
Commits on Feb 24, 2007
  1. diff-patch: Avoid emitting double-slashes in textual patch.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 23, 2007
  2. Reword git-am 3-way fallback failure message.

    When the blobs recorded on the index lines in the patch as pre-image
    blobs are not found in the repository, "git-am" punted saying
    that the index line does not record anything useful.  This was not
    clear enough -- the index line does have something useful but the
    problem was that it was not useful in _that_ repository.
    
    Reword the message as Francis Moreau suggests.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 24, 2007
  3. @robinrosenberg

    Limit filename for format-patch

    Badly formatted commits may have very long comments. This causes
    git-format-patch to fail. To avoid that, truncate the filename
    to a value we believe will always work.
    
    Err out if the patch file cannot be created.
    
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    robinrosenberg committed with Junio C Hamano Feb 23, 2007
  4. core.legacyheaders: Use the description used in RelNotes-1.5.0

    It explains what it does and why, and says how to use the new format.
    
    Signed-off-by: Santi Béjar <sbejar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Santi Béjar committed with Junio C Hamano Feb 23, 2007
  5. @ldv-alt

    git-show-ref --verify: Fail if called without a reference

    builtin-show-ref.c (cmd_show_ref): Fail if called with --verify option but
    without a reference.
    
    Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ldv-alt committed with Junio C Hamano Feb 23, 2007
Commits on Feb 23, 2007
  1. @dscho

    git-diff: fix combined diff

    The code forgets that typecast binds tighter than addition, in
    other words:
    
        (cast *)array + i  === ((cast *)array) + i
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Feb 23, 2007
  2. @frekui

    Fix 'git commit -a' in a newly initialized repository

    With current git:
    
    $ git init
    $ git commit -a
    cp: cannot stat `.git/index': No such file or directory
    
    Output a nice error message instead.
    
    Signed-off-by: Fredrik Kuivinen <frekui@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    frekui committed with Junio C Hamano Feb 22, 2007
Commits on Feb 22, 2007
  1. @spearce

    Include git-gui credits file in dist.

    The Makefile for the git-gui subproject will fail to execute if run
    outside of a git.git directory, such as when building from a .tar.gz
    or .tar.bz2.  This is because it is looking for the credits file,
    which was created but omitted from the tarball by the toplevel
    Makefile.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Feb 21, 2007
  2. @spearce

    Document the new core.bare configuration option.

    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spearce committed with Junio C Hamano Feb 21, 2007
Commits on Feb 21, 2007
  1. Merge branch 'master' of git://repo.or.cz/git-gui into maint

    * 'master' of git://repo.or.cz/git-gui:
      git-gui: Don't crash in citool mode on initial commit.
      git-gui: Remove TODO list.
      git-gui: Include browser in our usage message.
      git-gui: Change summary of git-gui.
      git-gui: Display all authors of git-gui.
      git-gui: Use mixed path for docs on Cygwin.
      git-gui: Correct crash when saving options in blame mode.
      git-gui: Expose the browser as a subcommand.
      git-gui: Create new branches from a tag.
      git-gui: Prefer version file over git-describe.
      git-gui: Print version on the console.
      git-gui: More consistently display the application name.
      git-gui: Permit merging tags into the current branch.
      git-gui: Basic version check to ensure git 1.5.0 or later is used.
      git-gui: Refactor 'exec git subcmd' idiom.
    Junio C Hamano committed Feb 21, 2007
  2. @spearce

    Use gunzip -c over gzcat in import-tars example.

    Not everyone has gzcat or bzcat installed on their system, but
    gunzip -c and bunzip2 -c perform the same task and are available
    if the user has installed gzip support or bzip2 support.
    
    Signed-off-by: Michael Loeffler <zvpunry@zvpunry.de>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Michael Loeffler committed with spearce Feb 14, 2007
  3. @spearce

    git-gui: Don't crash in citool mode on initial commit.

    Attempting to use `git citool` to create an initial commit caused
    git-gui to crash with a Tcl error as it tried to add the newly
    born branch to the non-existant branch menu.  Moving this code
    to after the normal commit cleanup logic resolves the issue, as
    we only have a branch menu if we are not in singlecommit mode.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    spearce committed Feb 21, 2007
  4. @spearce

    git-gui: Remove TODO list.

    I'm apparently not very good at keeping my own TODO file current.
    I its also somewhat strange to keep the TODO list as part of the
    software branch, as its meta-information that is not directly
    related to the code.  I'm pulling the TODO list from git-gui and
    moving it into a seperate branch.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    spearce committed Feb 21, 2007
  5. @spearce

    git-gui: Include browser in our usage message.

    Now that the 'browser' subcommand can be used to startup the tree
    browser, it should be listed as a possible subcommand option in
    our usage message.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    spearce committed Feb 21, 2007
  6. @spearce

    git-gui: Change summary of git-gui.

    Since git-gui does more than create commits, it is unfair to call
    it "a commit creation tool".  Instead lets just call it a graphical
    user interface.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    spearce committed Feb 18, 2007
  7. @spearce

    git-gui: Display all authors of git-gui.

    Now that git-gui has been released to the public as part of Git 1.5.0
    I am starting to see some work from other people beyond myself and
    Paul.  Consequently the copyright for git-gui is not strictly the
    two of us anymore, and these others deserve to have some credit
    given to them.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    spearce committed Feb 18, 2007
  8. @spearce

    git-gui: Use mixed path for docs on Cygwin.

    The Firefox browser requires that a URL use / to delimit directories.
    This is instead of \, as \ gets escaped by the browser into its hex
    escape code and then relative URLs are incorrectly resolved, Firefox
    no longer sees the directories for what they are.  Since we are
    handing the browser a true URL, we better use the standard / for
    directories.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    spearce committed Feb 18, 2007
  9. Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.

    Thanks to Simon 'corecode' Schubert <corecode@fs.ei.tum.de> for
    the clean-up.  Defining the C99 standard PRIuMAX when necessary
    replaces UM_FMT and the awkward UM10_FMT.  There are no direct
    C99 translations for other uses of NO_C99_FORMAT in git, alas.
    
    Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Jason Riedy committed with Junio C Hamano Feb 20, 2007
Commits on Feb 20, 2007
  1. Obey NO_C99_FORMAT in fast-import.c.

    Define UM_FMT and UM10_FMT and use in place of %ju and %10ju,
    respectively.  Both format as unsigned long long, so this
    assumes the compiler supports long long.
    
    Signed-off-by: Jason Riedy <jason@acm.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Jason Riedy committed with Junio C Hamano Feb 19, 2007
  2. Add a compat/strtoumax.c for Solaris 8.

    Solaris 8 was pre-c99, and they weren't willing to commit to
    the strtoumax definition according to /usr/include/inttypes.h.
    
    This adds NO_STRTOUMAX and NO_STRTOULL for ancient systems.
    If NO_STRTOUMAX is defined, the routine in compat/strtoumax.c
    will be used instead.  That routine passes its arguments to
    strtoull unless NO_STRTOULL is defined.  If NO_STRTOULL, then
    the routine uses strtoul (unsigned long).
    
    Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
    Acked-by: Shawn O Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Jason Riedy committed with Junio C Hamano Feb 19, 2007
  3. git-clone: Sync documentation to usage note.

    Documentation advertises the new `--depth <n>' parameter with an equal
    sign, while the usage notes (shown after `git-clone --help') do not.  If I
    understood git-clone's source code correctly, the version without the
    equal sign is correct, which is why this patch syncs documentation to the
    usage note.
    
    Signed-off-by: Christian Schlotter <schlotter@users.sourceforge.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Christian Schlotter committed with Junio C Hamano Feb 19, 2007
Commits on Feb 19, 2007
  1. GIT 1.5.0.1

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 18, 2007