Permalink
Commits on Mar 28, 2007
  1. GIT 1.5.0.6

    Junio C Hamano
    Junio C Hamano committed Mar 28, 2007
  2. commit: fix pretty-printing of messages with "\nencoding "

    peff authored and Junio C Hamano committed Mar 28, 2007
    The function replace_encoding_header is given the whole
    commit buffer, including the commit message. When looking
    for the encoding header, if none was found in the header, it
    would locate any line in the commit message matching
    "\nencoding " and remove it.
    
    Instead, we now make sure to search only to the end of the
    header.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. t4118: be nice to non-GNU sed

    dscho authored and Junio C Hamano committed Mar 23, 2007
    Elias Pipping:
    > I'm on a mac, hence /usr/bin/sed is not gnu sed, which makes
    > t4118 fail.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Ack'd-by: Elias Pipping <pipping@macports.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-commit: "read-tree -m HEAD" is not the right way to read-tree qui…

    Junio C Hamano
    Junio C Hamano committed Mar 28, 2007
    …ckly
    
    It still looks at the working tree and checks for locally
    modified paths.  When are preparing a temporary index from HEAD,
    we do not want any of that.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 25, 2007
  1. Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

    Junio C Hamano
    Junio C Hamano committed Mar 25, 2007
    * 'maint' of git://linux-nfs.org/~bfields/git:
      user-manual: introduce "branch" and "branch head" differently
      glossary: clean up cross-references
      glossary: stop generating automatically
      user-manual: Use def_ instead of ref_ for glossary references.
      user-manual.txt: fix a tiny typo.
      user-manual: run xsltproc without --nonet option
  2. gitweb: Add some installation notes in gitweb/INSTALL

    jnareb authored and Junio C Hamano committed Mar 24, 2007
    Add some installation and configuration notes for gitweb in
    gitweb/INSTALL. Make use of filling gitweb configuration by
    Makefile.
    
    It does not cover (yet?) all the configuration variables and
    options.
    
    Some of contents duplicates information in gitweb/README file
    (it is referred from gitweb/INSTALL).
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. gitweb: Fix not marking signoff lines in "log" view

    jnareb authored and Junio C Hamano committed Mar 24, 2007
    The CSS selector for signoff lines style was too strict: in the "log"
    view the commit message is not encompassed in container "page_body"
    div.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. gitweb: Don't escape attributes in CGI.pm HTML methods

    jnareb authored and Junio C Hamano committed Mar 7, 2007
    There is no need to escape HTML tag's attributes in CGI.pm
    HTML methods (like CGI::a()), because CGI.pm does attribute
    escaping automatically.
    
      $cgi->a({ ... -attribute => atribute_value }, tag_contents)
    
    is translated to
    
      <a ... attribute="attribute_value">tag_contents</a>
    
    The rules for escaping attribute values (which are string contents) are
    different. For example you have to take care about escaping embedded '"'
    and "'" characters; CGI::a() does that for us automatically.
    
    CGI::a() does not HTML escape tag_contents; we would need to write
    
      <a href="URL">some <b>bold</b> text</a>
    
    for example. So we use esc_html (or esc_path) to escape tag_contents
    as needed.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. gitweb: Change to use explicitly function call cgi->escapHTML()

    Li Yang Junio C Hamano
    Li Yang authored and Junio C Hamano committed Mar 6, 2007
    Change to use explicitly function call cgi->escapHTML().
    This fix the problem on some systems that escapeHTML() is not
    functioning, as default CGI is not setting 'escape' parameter.
    
    Signed-off-by: Li Yang <leoli@freescale.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 23, 2007
  1. gitweb: Fix "next" link in commit view

    jnareb authored and Junio C Hamano committed Mar 23, 2007
    Fix copy'n'paste error in commit c9d193d which caused that "next"
    link for merge commits in "commit" view
      (merge: _commit_ _commit_ ...)
    was to "commitdiff" view instead of being to "commit" view.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 22, 2007
  1. Documentation/pack-format.txt: Clear up description of types.

    Peter Eriksen Junio C Hamano
    Peter Eriksen authored and Junio C Hamano committed Mar 21, 2007
    Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 21, 2007
  1. fix typo in git-am manpage

    Michael S. Tsirkin Junio C Hamano
    Michael S. Tsirkin authored and Junio C Hamano committed Mar 21, 2007
    Fix typo in git-am manpage
    
    Signed-off-by: Michael S. Tsirkin <mst@dev.mellanox.co.il>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 19, 2007
  1. user-manual: introduce "branch" and "branch head" differently

    J. Bruce Fields
    J. Bruce Fields committed Mar 19, 2007
    I was using "branch" to mean "head", but that's perhaps a little
    sloppy; so instead start by using the terms "branch head" and "head",
    while still quickly falling back on "branch", since that's what
    people actually say more frequently.
    
    Also include glossary references on the first uses of "head" and "tag".
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  2. glossary: clean up cross-references

    J. Bruce Fields
    J. Bruce Fields committed Mar 18, 2007
    Manual clean-up of cross-references, and also clean up a few definitions (e.g.
    git-rebase).
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  3. glossary: stop generating automatically

    J. Bruce Fields
    J. Bruce Fields committed Mar 18, 2007
    The sort_glossary.pl script sorts the glossary, checks for duplicates,
    and automatically adds cross-references.
    
    But it's not so hard to do all that by hand, and sometimes the automatic
    cross-references are a little wrong; so let's run the script one last
    time and check in its output.
    
    Note: to make the output fit better into the user manual I also deleted
    the acknowledgements at the end, which was maybe a little rude; feel
    free to object and I can find a different solution.
    
    Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  4. user-manual: Use def_ instead of ref_ for glossary references.

    J. Bruce Fields
    J. Bruce Fields committed Mar 18, 2007
    I'd like to start using references to the glossary in the user manual.
    The "ref_" prefix for these references seems a little generic; so
    replace with "def_".
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  5. user-manual.txt: fix a tiny typo.

    meyering authored and J. Bruce Fields committed Mar 18, 2007
    "file patch" was doubtless intended to be "file path",
    but "directory name" is clearer.
    
    Signed-off-by: Jim Meyering <jim@meyering.net>
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  6. user-manual: run xsltproc without --nonet option

    J. Bruce Fields
    J. Bruce Fields committed Mar 16, 2007
    The --nonet option prevents xsltproc from going to the network to find
    anything.  But it always tries to find them locally first, so for a
    user with the necessary docbook stylesheets installed the build will
    work just fine without xsltproc attempting to use the network; all
    --nonet does is make it fail rather than falling back on that.  That
    doesn't seem particularly helpful.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Commits on Mar 18, 2007
  1. GIT 1.5.0.5

    Junio C Hamano
    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 Junio C Hamano
    Santi Béjar authored and Junio C Hamano committed 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
    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 authored and Junio C Hamano committed 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
    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 authored and Junio C Hamano committed 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
    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 authored and spearce committed 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 authored and Junio C Hamano committed 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
    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 Junio C Hamano
    Avi Kivity authored and Junio C Hamano committed 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 authored and Junio C Hamano committed 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 authored and Junio C Hamano committed 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>