Skip to content
Commits on Apr 4, 2007
  1. GIT 1.5.0.7

    Not that this release really matters, as we will be doing
    1.5.1 tomorrow.  This commit is to tie the loose ends and
    merge all of "maint" branch into "master" in preparation.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 3, 2007
  2. rerere should not repeat the earlier hunks in later ones

    When a file has more then one conflicting hunks, it repeated the
    contents of previous hunks in output for later ones.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Apr 3, 2007
Commits on Mar 29, 2007
  1. git-upload-pack: make sure we close unused pipe ends

    Right now, we don't close the read end of the pipe when git-upload-pack
    runs git-pack-object, so we hang forever (why don't we get SIGALRM?)
    instead of dying with SIGPIPE if the latter dies, which seems to be the
    norm if the client disconnects.
    
    Thanks to Johannes Schindelin <Johannes.Schindelin@gmx.de> for
    pointing out where this close() needed to go.
    
    This patch has been tested on kernel.org for several weeks and appear
    to resolve the problem of git-upload-pack processes hanging around
    forever.
    
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    (cherry picked from commit 465b351)
    H. Peter Anvin committed with Junio C Hamano Mar 27, 2007
  2. Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.

    Please see http://bugs.debian.org/404795:
    
     In git-rev-parse(1), there is an example commit tree, which is used twice.
     The explanation for this tree is very clear: B and C are commit *parents* to
     A.
    
     However, when the tree is reused as an example in the SPECIFYING RANGES, the
     manpage author screws up and uses A as a commit *parent* to B and C!  I.e.,
     he inverts the tree.
    
     And the fact that for this example you need to read the tree backwards is
     not explained anywhere (and it would be confusing even if it was).
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Gerrit Pape committed with Junio C Hamano Mar 29, 2007
  3. Documentation/git-svnimport.txt: fix typo.

    This was noticed by Frederik Schwarzer.  SVN's repository by default has
    trunk, tags/, and branch_es_/.
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Gerrit Pape committed with Junio C Hamano Mar 29, 2007
Commits on Mar 28, 2007
  1. GIT 1.5.0.6

    Junio C Hamano committed Mar 28, 2007
  2. @peff

    commit: fix pretty-printing of messages with "\nencoding "

    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>
    peff committed with Junio C Hamano Mar 28, 2007
  3. @dscho

    t4118: be nice to non-GNU sed

    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>
    dscho committed with Junio C Hamano Mar 22, 2007
  4. git-commit: "read-tree -m HEAD" is not the right way to read-tree qui…

    …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>
    Junio C Hamano committed Mar 28, 2007
Commits on Mar 25, 2007
  1. Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

    * '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
    Junio C Hamano committed Mar 25, 2007
  2. @jnareb

    gitweb: Add some installation notes in gitweb/INSTALL

    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>
    jnareb committed with Junio C Hamano Mar 24, 2007
  3. @jnareb

    gitweb: Fix not marking signoff lines in "log" view

    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>
    jnareb committed with Junio C Hamano Mar 24, 2007
  4. @jnareb

    gitweb: Don't escape attributes in CGI.pm HTML methods

    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>
    jnareb committed with Junio C Hamano Mar 7, 2007
  5. gitweb: Change to use explicitly function call cgi->escapHTML()

    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>
    Li Yang committed with Junio C Hamano Mar 6, 2007
Commits on Mar 23, 2007
  1. @jnareb

    gitweb: Fix "next" link in commit view

    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>
    jnareb committed with Junio C Hamano Mar 23, 2007
Commits on Mar 22, 2007
  1. Documentation/pack-format.txt: Clear up description of types.

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

    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>
    Michael S. Tsirkin committed with Junio C Hamano Mar 21, 2007
Commits on Mar 19, 2007
  1. user-manual: introduce "branch" and "branch head" differently

    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>
    J. Bruce Fields committed Mar 18, 2007
  2. glossary: clean up cross-references

    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>
    J. Bruce Fields committed Mar 18, 2007
  3. glossary: stop generating automatically

    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>
    J. Bruce Fields committed Mar 18, 2007
  4. user-manual: Use def_ instead of ref_ for glossary references.

    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>
    J. Bruce Fields committed Mar 17, 2007
  5. @meyering

    user-manual.txt: fix a tiny typo.

    "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>
    meyering committed with J. Bruce Fields Mar 18, 2007
  6. user-manual: run xsltproc without --nonet option

    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>
    J. Bruce Fields committed Mar 16, 2007
Commits on Mar 18, 2007
  1. GIT 1.5.0.5

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

    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>
    Santi Béjar committed with Junio C Hamano Mar 16, 2007
Commits on Mar 14, 2007
  1. GIT 1.5.0.4

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 14, 2007
  2. @ydirson

    Clarify doc for git-config --unset-all.

    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>
    ydirson committed with Junio C Hamano Mar 14, 2007
  3. git-checkout: fix "eval" used for merge labelling.

    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>
    Junio C Hamano committed Mar 14, 2007
  4. @flichtenheld

    cvsserver: asciidoc formatting changes

    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>
    flichtenheld committed with Junio C Hamano Mar 13, 2007
Commits on Mar 13, 2007
  1. Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint

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

    fast-import: grow tree storage more aggressively

    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>
    peff committed with spearce Mar 10, 2007
  2. @spearce

    Don't package the git-gui credits file anymore

    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>
    spearce committed with Junio C Hamano Mar 12, 2007
  3. Merge branch 'maint' of git://repo.or.cz/git-gui into maint

    * '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
    Junio C Hamano committed Mar 12, 2007
  4. @spearce

    git-gui: Allow 'git gui version' outside of a repository

    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>
    spearce committed Mar 12, 2007
  5. @spearce

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

    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>
    spearce committed Mar 12, 2007
Something went wrong with that request. Please try again.