Permalink
Commits on Jun 2, 2007
  1. GIT 1.5.2.1

    Junio C Hamano committed Jun 2, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Use =20 when rfc2047 encoding spaces.

    krh committed with Junio C Hamano Jun 1, 2007
    Encode ' ' using '=20' even though rfc2047 allows using '_' for
    readability.  Unfortunately, many programs do not understand this and
    just leave the underscore in place.  Using '=20' seems to work better.
    
    [jc: with adjustment to t3901]
    
    Signed-off-by: Kristian Høgsberg <hoegsberg@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Create a new manpage for the gitignore format, and reference it elsew…

    joshtriplett committed with Junio C Hamano Jun 2, 2007
    …here
    
    Only git-ls-files(1) describes the gitignore format in detail, and it does so
    with reference to git-ls-files options.  Most users don't use the plumbing
    command git-ls-files directly, and shouldn't have to look in its manpage for
    information on the gitignore format.
    
    Create a new manpage gitignore(5) (Documentation/gitignore.txt), and factor
    out the gitignore documentation into that file, changing it to refer to
    .gitignore and $GIT_DIR/info/exclude as used by porcelain commands.  Reference
    gitignore(5) from other relevant manpages and documentation.  Remove
    now-redundant information on exclude patterns from git-ls-files(1), leaving
    only information on how git-ls-files options specify exclude patterns and what
    precedence they have.
    
    Signed-off-by: Josh Triplett <josh@freedesktop.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Documentation: robustify asciidoc GIT_VERSION replacement

    peff committed with Junio C Hamano Jun 1, 2007
    Instead of using sed on the resulting file, we now have a
    git_version asciidoc attribute. This means that we don't
    pipe the output of asciidoc, which means we can detect build
    failures.
    
    Problem reported by Scott Lamb, solution suggested by Jonas Fonseca.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 31, 2007
  1. Merge branch 'maint-1.5.1' into maint

    Junio C Hamano committed May 31, 2007
    * maint-1.5.1:
      git-config: Improve documentation of git-config file handling
      git-config: Various small fixes to asciidoc documentation
      decode_85(): fix missing return.
      fix signed range problems with hex conversions
  2. git-config: Improve documentation of git-config file handling

    flichtenheld committed with Junio C Hamano May 31, 2007
    The description which files git-config uses and how the various
    command line options and environment variables affect its
    behaviour was incomplete, outdated and confusing.
    
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-config: Various small fixes to asciidoc documentation

    flichtenheld committed with Junio C Hamano May 31, 2007
    Add '' around the only mentioned commandline option that didn't
    have it.
    
    Make reference to section EXAMPLE a link and rename it to
    EXAMPLES because it actually contains a lot of examples.
    
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 30, 2007
  1. decode_85(): fix missing return.

    Jerald Fitzjerald committed with Junio C Hamano May 30, 2007
    When the function detected an invalid base85 sequence, it issued
    an error message but forgot to return error status at that point
    and kept going.
    
    Signed-off-by: Jerald Fitzjerald <jfj@freemail.gr>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. fix signed range problems with hex conversions

    torvalds committed with Junio C Hamano May 30, 2007
    Make hexval_table[] "const".  Also make sure that the accessor
    function hexval() does not access the table with out-of-range
    values by declaring its parameter "unsigned char", instead of
    "unsigned int".
    
    With this, gcc can just generate:
    
    	movzbl  (%rdi), %eax
    	movsbl  hexval_table(%rax),%edx
    	movzbl  1(%rdi), %eax
    	movsbl  hexval_table(%rax),%eax
    	sall    $4, %edx
    	orl     %eax, %edx
    
    for the code to generate a byte from two hex characters.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 29, 2007
  1. cvsserver: Fix some typos in asciidoc documentation

    flichtenheld committed with Junio C Hamano May 27, 2007
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. cvsserver: Note that CVS_SERVER can also be specified as method variable

    flichtenheld committed with Junio C Hamano May 27, 2007
    Reasonably new versions of the cvs CLI client allow one to
    specifiy CVS_SERVER as a method variable directly in
    CVSROOT. This is way more convinient than using an
    environment variable since it gets saved in CVS/Root.
    
    Since I only discovered this by accident I guess there
    might be others out there that learnt CVS on the 1.11
    series (or even earlier) and profit from such a note
    about cvs improvements in the last couple years.
    
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. cvsserver: Correct inetd.conf example in asciidoc documentation

    flichtenheld committed with Junio C Hamano May 27, 2007
    While the given example worked, it made us look rather
    incompetent. Give the correct reason why one needs the
    more complex syntax and change the example to reflect
    that.
    
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. user-manual: fixed typo in example

    sprohaska committed with Junio C Hamano May 26, 2007
    Signed-off-by: Steffen Prohaska <prohaska@zib.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Add test case for $Id$ expanded in the repository

    andyparkins committed with Junio C Hamano May 27, 2007
    This test case would have caught the bug fixed by revision
    c23290d.
    
    It puts various forms of $Id$ into a file in the repository,
    without allowing git to collapse them to uniformity.  Then enables the
    $Id$ expansion on checkout, and checks that what is checked out has
    coped with the various forms.
    
    Signed-off-by: Andy Parkins <andyparkins@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Merge branch 'maint-1.5.1' into maint

    Junio C Hamano committed May 29, 2007
    * maint-1.5.1:
      git-svn: avoid md5 calculation entirely if SVN doesn't provide one
      Fix stupid typo in lookup_tag()
  7. git-svn: avoid md5 calculation entirely if SVN doesn't provide one

    Eric Wong committed with Junio C Hamano May 27, 2007
    There's no point in calculating an MD5 if we're not going to use
    it.  We'll also avoid the possibility of there being a bug in the
    Perl MD5 library not being able to handle zero-sized files.
    
    This is a followup to 20b3d20,
    which allows us to track repositories that do not provide MD5
    checksums.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Merge branch 'maint' of git://repo.or.cz/git-gui into maint

    Junio C Hamano committed May 29, 2007
    * 'maint' of git://repo.or.cz/git-gui:
      git-gui: Guess our share/git-gui/lib path at runtime if possible
      Correct key bindings to Control-<foo>
      git-gui: Tighten internal pattern match for lib/ directory
  9. Makefile: Remove git-fsck and git-verify-pack from PROGRAMS

    pclouds committed with Junio C Hamano May 29, 2007
    Those are builtins. Remove them from PROGRAMS variable
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 28, 2007
  1. Fix stupid typo in lookup_tag()

    jherland committed with Junio C Hamano May 28, 2007
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 27, 2007
  1. git-gui: Guess our share/git-gui/lib path at runtime if possible

    spearce committed May 27, 2007
    Johannes Sixt asked me to try to avoid embedding the runtime location
    of git-gui's library directory in the executable script.  Not embedding
    it helps the MinGW to be relocatable to another directory should a user
    wish to install the programs in a directory other than the location the
    packager wanted them to be installed into.
    
    Most of this is a hack.  We try to determine if the path of our master
    git-gui script will be able to locate the lib by ../share/git-gui/lib.
    This should be true if $(gitexecdir) and $(libdir) have the same prefix.
    If they do then we defer the assignment of $(libdir) until runtime, and
    we get it from $argv0 rather than embedding it into the script itself.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on May 26, 2007
  1. Merge branch 'maint-1.5.1' into maint

    Junio C Hamano committed May 26, 2007
    * maint-1.5.1:
      Fix git-svn to handle svn not reporting the md5sum of a file, and test.
      More echo "$user_message" fixes.
      Add tests for the last two fixes.
      git-commit: use printf '%s\n' instead of echo on user-supplied strings
      git-am: use printf instead of echo on user-supplied strings
      Documentation: Add definition of "evil merge" to GIT Glossary
      Replace the last 'dircache's by 'index'
      Documentation: Clean up links in GIT Glossary
  2. Fix git-svn to handle svn not reporting the md5sum of a file, and test.

    jyknight committed with Junio C Hamano May 24, 2007
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Fix mishandling of $Id$ expanded in the repository copy in convert.c

    andyparkins committed with Junio C Hamano May 25, 2007
    If the repository contained an expanded ident keyword (i.e. $Id:XXXX$),
    then the wrong bytes were discarded, and the Id keyword was not
    expanded.  The fault was in convert.c:ident_to_worktree().
    
    Previously, when a "$Id:" was found in the repository version,
    ident_to_worktree() would search for the next "$" after this, and
    discarded everything it found until then.  That was done with the loop:
    
        do {
            ch = *cp++;
            if (ch == '$')
                break;
            rem--;
        } while (rem);
    
    The above loop left cp pointing one character _after_ the final "$"
    (because of ch = *cp++).  This was different from the non-expanded case,
    were cp is left pointing at the "$", and was different from the comment
    which stated "discard up to but not including the closing $".  This
    patch fixes that by making the loop:
    
        do {
            ch = *cp;
            if (ch == '$')
                break;
            cp++;
            rem--;
        } while (rem);
    
    That is, cp is tested _then_ incremented.
    
    This loop exits if it finds a "$" or if it runs out of bytes in the
    source.  After this loop, if there was no closing "$" the expansion is
    skipped, and the outer loop is allowed to continue leaving this
    non-keyword as it was.  However, when the "$" is found, size is
    corrected, before running the expansion:
    
        size -= (cp - src);
    
    This is wrong; size is going to be corrected anyway after the expansion,
    so there is no need to do it here.  This patch removes that redundant
    correction.
    
    To help find this bug, I heavily commented the routine; those comments
    are included here as a bonus.
    
    Signed-off-by: Andy Parkins <andyparkins@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. More echo "$user_message" fixes.

    peff committed with Junio C Hamano May 26, 2007
    Here are fixes to more uses of 'echo "$msg"' where $msg could contain
    backslashed sequence.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Add tests for the last two fixes.

    Junio C Hamano committed May 26, 2007
    This updates t4014 to check the two fixes for git-am and git-commit
    we observed with "echo" that does backslash interpolation by default
    without being asked with -e option.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. git-commit: use printf '%s\n' instead of echo on user-supplied strings

    Junio C Hamano committed May 26, 2007
    This fixes the same issue git-am had, which was fixed by Jeff
    King in the previous commit.  Cleverly enough, this commit's log
    message is a good test case at the same time.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. git-am: use printf instead of echo on user-supplied strings

    peff committed with Junio C Hamano May 26, 2007
    Under some implementations of echo (such as that provided by
    dash), backslash escapes are recognized without any other
    options. This means that echo-ing user-supplied strings may
    cause any backslash sequences in them to be converted. Using
    printf resolves the ambiguity.
    
    This bug can be seen when using git-am to apply a patch
    whose subject contains the character sequence "\n"; the
    characters are converted to a literal newline. Noticed by
    Szekeres Istvan.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Documentation: Add definition of "evil merge" to GIT Glossary

    jnareb committed with Junio C Hamano May 25, 2007
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. Replace the last 'dircache's by 'index'

    jnareb committed with Junio C Hamano May 25, 2007
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Documentation: Clean up links in GIT Glossary

    jnareb committed with Junio C Hamano May 25, 2007
    Ensure that the same link is not repeated in single glossary entry,
    and that there is no self-link i.e. link to current entry.
    
    Add links to other definitions in git glossary.
    
    Remove inappropriate (nonsense) links, or change link to link to
    correct definition (to correct term).
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 25, 2007
  1. Merge branch 'master' of git://repo.or.cz/git/fastimport into maint

    Junio C Hamano committed May 25, 2007
    * 'master' of git://repo.or.cz/git/fastimport:
      Update bash completion for git-config options
      Teach bash completion about recent log long options
      Teach bash completion about 'git remote update'
      Update bash completion header documentation
      Remove a duplicate --not option in bash completion
      Teach bash completion about git-shortlog
      Hide the plumbing diff-{files,index,tree} from bash completion
      Update bash completion to ignore some more plumbing commands
  2. Merge branch 'maint-1.5.1' into maint

    Junio C Hamano committed May 25, 2007
    * maint-1.5.1:
      fix memory leak in parse_object when check_sha1_signature fails
      name-rev: tolerate clock skew in committer dates
  3. fix memory leak in parse_object when check_sha1_signature fails

    jasampler committed with Junio C Hamano May 25, 2007
    When check_sha1_signature fails, program is not terminated:
    it prints an error message and returns NULL, so the
    buffer returned by read_sha1_file should be freed before.
    
    Signed-off-by: Carlos Rica <jasampler@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 24, 2007
  1. name-rev: tolerate clock skew in committer dates

    Junio C Hamano committed May 24, 2007
    In git.git repository, "git-name-rev v1.3.0~158" cannot name the
    rev, while adjacent revs can be named.
    
    This was because it gives up traversal from the tips of existing
    refs as soon as it sees a commit that has older commit timestamp
    than what is being named.  This is usually a good heuristics,
    but v1.3.0~158 has a slightly older commit timestamp than
    v1.3.0~157 (i.e. it's child), as these two were made in a
    separate repostiory (in fact, in a different continent).
    
    This adds a hardcoded slop value (1 day) to the cut-off
    heuristics to work this kind of problem around.  The current
    algorithm essentially runs around from the available tips down
    to ancient commits and names every single rev available that are
    newer than cut-off date, so a single day slop would not add that
    much overhead in repositories with long enough history where the
    performance of name-rev matters.
    
    I think the algorithm could be made a bit smarter by deepening
    the graph on demand as a new commit is asked to be named (this
    would require rewriting of name_rev() function not to recurse
    itself but use a traversal list like revision.c traverser does),
    but that would be a separate issue.
    
    Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Correct key bindings to Control-<foo>

    spearce committed May 24, 2007
    Alberto Bertogli reported on #git that git-gui was exiting with
    alt-q, while gitk on the same system was exiting with ctrl-q.
    That was not what I wanted.  I really wanted M1B to be bound to
    the Control key on most non-Mac OS X platforms, but according to
    Sam Vilain M1 on most systems means alt.  Since gitk always does
    control, I'm doing the same thing for all non-Mac OS X systems.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>