Permalink
Commits on Mar 18, 2007
  1. GIT 1.5.0.5

    Junio C Hamano committed Mar 18, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 16, 2007
  1. git-merge: finish when git-read-tree fails

    Santi Béjar committed with Junio C Hamano Mar 16, 2007
    The message formating (commit v1.5.0.3-28-gbe242d5) broke the && chain.
    
    Noticed by Dmitry Torokhov.
    
    Signed-off-by: Santi Béjar <sbejar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 14, 2007
  1. GIT 1.5.0.4

    Junio C Hamano committed Mar 14, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Clarify doc for git-config --unset-all.

    ydirson committed with Junio C Hamano Mar 14, 2007
    Previous formulation could make it appear as removing all lines
    matching a regexp (at least, I was looking for such a flag, and
    confused this flag for what I was looking for).
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-checkout: fix "eval" used for merge labelling.

    Junio C Hamano committed Mar 14, 2007
    The symbolic notation of the fork point can contain whitespaces (e.g.
    "git checkout -m 'HEAD@{9 hours ago}'").  Quote strings properly
    when using eval to prepare GITHEAD_$new
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. cvsserver: asciidoc formatting changes

    flichtenheld committed with Junio C Hamano Mar 13, 2007
    Format some lists really as lists. Improves both html and man
    output.
    
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 13, 2007
  1. Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint

    Junio C Hamano committed Mar 13, 2007
    * 'maint' of git://repo.or.cz/git/fastimport:
      fast-import: grow tree storage more aggressively
Commits on Mar 12, 2007
  1. fast-import: grow tree storage more aggressively

    peff committed with spearce Mar 11, 2007
    When building up a tree for a commit, fast-import
    dynamically allocates memory for the tree entries. When more
    space is needed, the allocated memory is increased by a
    constant amount. For very large trees, this means
    re-allocating and memcpy()ing the memory O(n) times.
    
    To compound this problem, releasing the previous tree
    resource does not free the memory; it is kept in a pool
    for future trees. This means that each of the O(n)
    allocations will consume increasing amounts of memory,
    giving O(n^2) memory consumption.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. Don't package the git-gui credits file anymore

    spearce committed with Junio C Hamano Mar 12, 2007
    Since git-gui 0.6.4 the credits file is no longer produced.
    This file was removed from git-gui due to build issues that
    a lot of users and Git developers have reported running into.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Merge branch 'maint' of git://repo.or.cz/git-gui into maint

    Junio C Hamano committed Mar 12, 2007
    * 'maint' of git://repo.or.cz/git-gui:
      git-gui: Allow 'git gui version' outside of a repository
      git-gui: Revert "git-gui: Display all authors of git-gui."
      git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
      git-gui: Allow committing empty merges
  4. git-gui: Allow 'git gui version' outside of a repository

    spearce committed Mar 12, 2007
    I got a little surprise one day when I tried to run 'git gui version'
    outside of a Git repository to determine what version of git-gui was
    installed on that system.  Turns out we were doing the repository
    check long before we got around to command line argument handling.
    
    We now look to see if the only argument we have been given is
    'version' or '--version', and if so, print out the version and
    exit immediately; long before we consider looking at the Git
    version or working directory.  This way users can still get to
    the git-gui version number even if Git's version cannot be read.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  5. git-gui: Revert "git-gui: Display all authors of git-gui."

    spearce committed Mar 12, 2007
    This reverts commit 871f4c9.
    
    Too many users have complained about the credits generator in
    git-gui, so I'm backing the entire thing out.  This revert will
    finish that series.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  6. git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."

    spearce committed Mar 12, 2007
    This reverts commit 92446ab.
    
    Too many users have complained about the credits generator in
    git-gui, so I'm backing the entire thing out.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  7. git-gui: Allow committing empty merges

    spearce committed Mar 12, 2007
    Johannes Sixt noticed that git-gui would not let the user commit
    a merge created by `git merge -s ours` as the ours strategy does
    not alter the tree (that is HEAD^1^{tree} = HEAD^{tree} after the
    merge).  The same issue arises from amending such a merge commit.
    
    We now permit an empty commit (no changed files) if we are doing
    a merge commit.  Core Git does this with its command line based
    git-commit tool, so it makes sense for the GUI to do the same.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  8. git-send-email: Document configuration options

    Avi Kivity committed with Junio C Hamano Mar 11, 2007
    Wishing to implement an email aliases file, I found that they were already
    implmented.  Document them for the next user.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. git-merge: warn when -m provided on a fast forward

    bfields committed with Junio C Hamano Mar 11, 2007
    Warn the user that the "-m" option is ignored in the case of a fast
    forward.  That may save some confusion in the case where the user
    doesn't know about fast forwards yet and may not realize that the
    behavior here is intentional.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 11, 2007
  1. git.el: Retrieve commit log information from .dotest directory.

    julliard committed with Junio C Hamano Mar 10, 2007
    If a git-am or git-rebase is in progress, fill the commit log buffer
    from the commit information found in the various files in the .dotest
    directory.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git.el: Avoid appending a signoff line that is already present.

    julliard committed with Junio C Hamano Mar 10, 2007
    Also avoid inserting an extra newline if other signoff lines are
    present.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. setup_git_directory_gently: fix off-by-one error

    matled committed with Junio C Hamano Mar 11, 2007
    don't tell getcwd that the buffer has one spare byte for an extra /
    
    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

    Junio C Hamano committed Mar 11, 2007
    * 'maint' of git://linux-nfs.org/~bfields/git:
      user-manual: install user manual stylesheet with other web documents
      user-manual: fix rendering of history diagrams
      user-manual: fix missing colon in git-show example
      user-manual: fix inconsistent use of pull and merge
      user-manual: fix inconsistent example
      glossary: fix overoptimistic automatic linking of defined terms
  5. user-manual: install user manual stylesheet with other web documents

    J. Bruce Fields committed Mar 11, 2007
    Install the stylesheet needed for the user manual.  This should solve
    the problem of, e.g.,
    
    	http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
    
    lacking a lot of formatting.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  6. user-manual: fix rendering of history diagrams

    J. Bruce Fields committed Mar 11, 2007
    Asciidoc appears to interpret a backslash at the end of a line as
    escaping the end-of-line character, which screws up the display of
    history diagrams like
    
     o--o--o
    	\
    	 o--...
    
    The obvious fix (replacing "\" by "\\") doesn't work.  The only
    workaround I've found is to include all such diagrams in a LiteralBlock.
    Asciidoc claims that should be equivalent to a literal paragraph, so I
    don't understand why the difference--perhaps it's an asciidoc bug.
    
    Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  7. user-manual: fix missing colon in git-show example

    J. Bruce Fields committed Mar 11, 2007
    There should be a colon in this git-show example.
    
    Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  8. user-manual: fix inconsistent use of pull and merge

    J. Bruce Fields committed Mar 11, 2007
    I used "git pull ." instead of "git merge" here without any explanation.
    Stick instead to "git merge" for now (the equivalent pull syntax is
    still covered in a later chapter).
    
    Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  9. user-manual: fix inconsistent example

    J. Bruce Fields committed Mar 11, 2007
    The configuration file fragment here is inconsistent with the text
    above.  Thanks to Ramsay Jones for the correction.
    
    Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  10. glossary: fix overoptimistic automatic linking of defined terms

    J. Bruce Fields committed Mar 5, 2007
    The script sort_glossary.pl turns each use of "term" into a link to the
    definition of "term".  To avoid mangling links like
    
    	gitlink:git-term[1]
    
    it doesn't replace any occurence of "term" preceded by "link:git-".
    This fails for gitlink:git-symbolic-ref[1] when substituting for "ref".
    
    So instead just refuse to replace anything preceded by a "-".
    That could result in missing some opportunities, but that's a less
    annoying error.
    
    Actually I find the automatic substitution a little distracting; some
    day maybe we should just run it once and commit the result, so it can
    be hand-tuned.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Commits on Mar 10, 2007
  1. Documentation: s/seperator/separator/

    peff committed with Junio C Hamano Mar 9, 2007
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Adjust reflog filemode in shared repository

    matthiask committed with Junio C Hamano Mar 9, 2007
    Without this, committing in a group-shared repository would not work
    even though all developers are in the same group.
    
    Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 7, 2007
  1. Catch write_ref_sha1 failure in receive-pack

    spearce committed with Junio C Hamano Mar 7, 2007
    This failure to catch the failure of write_ref_sha1 was noticed
    by Bill Lear.  The ref will not update if the log file could not
    be appended to (due to file permissions problems).  Such a failure
    should be flagged as a failure to update the ref, so that the client
    knows the push did not succeed.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. make t8001 work on Mac OS X again

    dscho committed with Junio C Hamano Mar 7, 2007
    The test was recently broken to expect sed to leave the
    incomplete line at the end without newline.
    
    POSIX says that output of the pattern space is to be followed by
    a newline, while GNU adds the newline back only when it was
    stripped when input.  GNU behaviour is arguably more intuitive
    and nicer, but we should not depend on it.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 6, 2007
  1. Merge branch 'master' of git://repo.or.cz/git-gui into maint

    Junio C Hamano committed Mar 6, 2007
    * 'master' of git://repo.or.cz/git-gui:
      git-gui: Make 'make' quieter by default
      git-gui: Remove unnecessary /dev/null redirection.
      git-gui: Don't create empty (same tree as parent) commits.
      git-gui: Add Reset to the Branch menu.
      git-gui: Relocate the menu/transport menu code.
  2. git-gui: Make 'make' quieter by default

    spearce committed Mar 6, 2007
    To fit nicely into the output of the git.git project's own quieter
    Makefile, we want to make the git-gui Makefile nice and quiet too.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  3. git-commit: cd to top before showing the final stat

    Junio C Hamano committed Mar 5, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Fix diff-options references in git-diff and git-format-patch

    Benabik committed with Junio C Hamano Mar 6, 2007
    Most of the git-diff-* documentation used [<common diff options>]
    instead of [--diff-options], so make that change in git-diff and
    git-format-patch.
    
    In addition, git-format-patch didn't include the meanings of the diff
    options.
    
    Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Add definition of <commit-ish> to the main git man page.

    tytso committed with Junio C Hamano Mar 5, 2007
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>