Permalink
Commits on Jan 30, 2006
  1. GIT 1.1.6

    Junio C Hamano committed Jan 30, 2006
  2. git push -f documentation

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    bfields committed with Junio C Hamano Jan 30, 2006
Commits on Jan 29, 2006
  1. git-branch: Documentation fixes

    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Fredrik Kuivinen committed with Junio C Hamano Jan 29, 2006
  2. merge-recursive: Improve the error message printed when merge(1) isn'…

    …t found.
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Fredrik Kuivinen committed with Junio C Hamano Jan 29, 2006
  3. [PATCH] pre-commit sample hook: do not barf on the initial import

    The example hook barfs on the initial import.  Ideally it should
    produce a diff from an empty tree, but for now let's stop at
    squelching the bogus error message.  Often an initial import
    involves tons of badly formatted files from foreign SCM, so not
    complaining about them like this patch does might actually be a
    better idea than enforcing the "Perfect Patch" format on them.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 29, 2006
Commits on Jan 27, 2006
  1. GIT 1.1.5

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 27, 2006
  2. GIT 1.0.13

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 27, 2006
  3. checkout: do not make a temporary copy of symlink target.

    If the index records an insanely long symbolic link, copying
    into the temporary would overflow the buffer (noticed by Mark
    Wooding).
    
    Because read_sha1_file() terminates the returned buffer with NUL
    since late May 2005, there is no reason to copy it anymore.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 27, 2006
Commits on Jan 20, 2006
  1. GIT 1.1.4

    Junio C Hamano committed Jan 20, 2006
  2. GIT 1.0.12

    Junio C Hamano committed Jan 20, 2006
  3. git-fetch-pack: really do not ask for funny refs

    If git-fetch-pack was called with out any refspec, it would ask the server
    for funny refs. That cannot work, since the funny refs are not marked
    as OUR_REF by upload-pack, which just exits with an error.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Jan 18, 2006
  4. Revert "check_packed_git_idx(): check integrity of the idx file itself."

    This reverts c5ced64 commit.
    It turns out that doing this check every time we map the idx file
    is quite expensive.  A corrupt idx file is caught by git-fsck-objects,
    so this check is not strictly necessary.
    
    In one unscientific test, 0.99.9m spent 10 seconds usertime for
    the same task 1.1.3 takes 37 seconds usertime.  Reverting this gives
    us the performance of 0.99.9 back.
    Junio C Hamano committed Jan 19, 2006
Commits on Jan 16, 2006
  1. GIT 1.1.3

    Junio C Hamano committed Jan 16, 2006
  2. describe: omit clearing marks on the last one.

    When describing more than one, we need to clear the commit marks
    before handling the next one, but most of the time we are
    running it for only one commit, and in such a case this clearing
    phase is totally unnecessary.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 16, 2006
  3. Merge branch 'fixo/1.0'

    Junio C Hamano committed Jan 16, 2006
  4. GIT 1.0.11

    Junio C Hamano committed Jan 16, 2006
  5. diffcore-break/diffcore-rename: integer overflow.

    While reviewing the end user tutorial rewrite by J. Bruce
    Fields, I noticed that "git-diff-tree -B -C" did not correctly
    break the total rewrite of Documentation/tutorial.txt.  It turns
    out that we had integer overflow during the break score
    computations.
    
    Cop out by using floating point.  This is not a kernel.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 16, 2006
Commits on Jan 14, 2006
  1. GIT 1.1.2

    Junio C Hamano committed Jan 14, 2006
  2. GIT 1.0.10

    Junio C Hamano committed Jan 14, 2006
Commits on Jan 13, 2006
  1. Documentation: git-reset - interrupted workflow.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 13, 2006
  2. Documentation: git-commit -a

    A bit more elaboration on what "update all paths" means.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 13, 2006
  3. Documentation: clarify fetch parameter descriptions.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    bfields committed with Junio C Hamano Jan 13, 2006
Commits on Jan 11, 2006
  1. show-branch: handle [] globs as well.

    Earlier only '?' and '*' signalled the command that what the
    user has given is a glob pattern.  This prevented us to say:
    
    	$ git show-branch 'v0.99.[0-3]'
    
    Now we notice '[' as well, so the above would work.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 11, 2006
  2. name-rev: do not omit leading components of ref name.

    In a repository with mainto/1.0 (to keep maintaining the 1.0.X
    series) and fixo/1.0 (to keep fixes that apply to both 1.0.X
    series and upwards) branches, "git-name-rev mainto/1.0" answered
    just "1.0" making things ambiguous.  Show refnames unambiguously
    like show-branch does.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 11, 2006
  3. describe: do not silently ignore indescribable commits

    We silently ignored indescribable commits without complaining.
    Complain and die instead.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 11, 2006
  4. update-index: work with c-quoted name

    update-index --stdin did not work with c-style quoted names even though
    update-index --index-info did.  This fixes the inconsistency.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 11, 2006
  5. Add git-describe to .gitignore.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    tomprince committed with Junio C Hamano Jan 11, 2006
  6. GIT 1.0.9

    Junio C Hamano committed Jan 11, 2006
  7. GIT 1.1.1

    Junio C Hamano committed Jan 11, 2006
  8. glossary: explain "master" and "origin"

    If you are a long time git user/developer, you forget that to a new git
    user, these words have not the same meaning as to you.
    
    [jc: with updates from J. Bruce Fields.]
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Jan 10, 2006
Commits on Jan 10, 2006
  1. GIT-VERSION-GEN: detect dirty tree and mark the version accordingly.

    If we are building from a working tree with local modifications,
    mark the version accordingly.
    
    Deliberately uses '-' to prevent RPM from being built from such
    a tree.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 9, 2006
  2. For release tarballs, include the proper version

    When producing a release tarball, include a "version" file, which
    GIT-VERSION-GEN can then use to do the right thing when building from a
    tarball.
    
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    H. Peter Anvin committed with Junio C Hamano Jan 10, 2006
Commits on Jan 8, 2006
  1. GIT 1.1.0

    Junio C Hamano committed Jan 8, 2006
  2. Add a test for rebase when a change was picked upstream

    This test exercises the standard feature that makes rebase useful.
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006
  3. Add a minimal test for git-cherry

    This test checks that git-cherry finds the expected number of patches
    in two simple cases, and then tests the new limit arguments.
    
    [jc: collapsed two patches into one and added sleep to make sure
     the two commits would get different timestamps]
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006