Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.5.1.6

May 20, 2007

  1. GIT 1.5.1.6

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 19, 2007
  2. Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

    * 'maint' of git://linux-nfs.org/~bfields/git:
      user-manual: Add section on ignoring files
      user-manual: finding commits referencing given file content
      user-manual: discourage shared repository
      tutorial: revise index introduction
      tutorials: add user-manual links
    authored May 19, 2007

May 19, 2007

  1. git-svn: don't minimize-url when doing an init that tracks multiple p…

    …aths
    
    I didn't have a chance to test the off-by-default minimize-url
    stuff enough before, but it's quite broken for people passing
    the --trunk/-T, --tags/-t, --branches/-b switches to "init" or
    "clone" commands.
    
    Additionally, follow-parent functionality seems broken when we're
    not connected to the root of the repository.
    
    Default behavior for "traditional" git-svn users who only track
    one directory (without needing follow-parent) should be
    reasonable, as those users started using things before
    minimize-url functionality existed.
    
    Behavior for users more used to the git-svnimport-like command
    line will also benefit from a more-flexible command-line than
    svnimport given the assumption they're working with
    non-restrictive read permissions on the repository.
    
    I hope to properly fix these bugs when I get a chance to in the
    next week or so, but I would like to get this stopgap measure of
    reverting to the old behavior as soon as possible.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 19, 2007 Junio C Hamano committed May 19, 2007
  2. git-svn: avoid crashing svnserve when creating new directories

    When sorting directory names by depth (slash ("/") count) and
    closing the deepest directories first (as the protocol
    requires), we failed to put the root baton (with an empty string
    as its key "") after top-level directories (which did not have
    any slashes).
    
    This resulted in svnserve being in a situation it couldn't
    handle and caused a segmentation fault on the remote server.
    
    This bug did not affect users of DAV and filesystem repositories.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Confirmed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 19, 2007 Junio C Hamano committed May 19, 2007
  3. Johan Herland

    user-manual: Add section on ignoring files

    The todo list at the end of the user manual says that something must be
    said about .gitignore. Also, there seems to be a lack of documentation
    on how to choose between the various types of ignore files (.gitignore
    vs. .git/info/exclude, etc.).
    
    This patch adds a section on ignoring files which try to introduce how
    to tell git about ignored files, and how the different strategies
    complement eachother.
    
    The syntax of exclude patterns is explained in a simplified manner, with
    a reference to git-ls-files(1) which already contains a more thorough
    explanation.
    
    Signed-off-by: Johan Herland <johan@herland.net>
    authored May 16, 2007 J. Bruce Fields committed May 19, 2007
  4. user-manual: finding commits referencing given file content

    Another amusing git exploration example brought up in irc.  (Credit to
    aeruder for the complete solution.)
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 19, 2007
  5. user-manual: discourage shared repository

    I don't really want to look like we're encouraging the shared repository
    thing.  Take down some of the argument for using purely
    single-developer-owned repositories and collaborating using patches and
    pulls instead.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 15, 2007
  6. tutorial: revise index introduction

    The embarassing history of this tutorial is that I started it without
    really understanding the index well, so I avoided mentioning it.
    
    And we all got the idea that "index" was a word to avoid using around
    newbies, but it was reluctantly mentioned that *something* had to be
    said.  The result is a little awkward: the discussion of the index never
    actually uses that word, and isn't well-integrated into the surrounding
    material.
    
    Let's just go ahead and use the word "index" from the very start, and
    try to demonstrate its use with a minimum of lecturing.
    
    Also, remove discussion of using git-commit with explicit filenames.
    We're already a bit slow here to get people to their first commit, and
    I'm not convinced this is really so important.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 18, 2007
  7. tutorials: add user-manual links

    Mention the user manual, especially as an alternative introduction for
    user's mainly interested in read-only operations.
    
    And fix a typo while we're there.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 17, 2007
  8. Matthias Kestenholz

    Documentation: Reformatted SYNOPSIS for several commands

    Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 18, 2007 Junio C Hamano committed May 18, 2007
  9. Matthias Kestenholz

    Documentation: Added [verse] to SYNOPSIS where necessary

    Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 18, 2007 Junio C Hamano committed May 18, 2007
  10. GIT v1.5.1.5

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 18, 2007
  11. Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

    * 'maint' of git://linux-nfs.org/~bfields/git:
      user-manual: reorganize public git repo discussion
      user-manual: listing commits reachable from some refs not others
      user-manual: introduce git
      user-manual: add a "counting commits" example
      user-manual: move howto/using-topic-branches into manual
      user-manual: move howto/make-dist.txt into user manual
      Documentation: remove howto's now incorporated into manual
      user-manual: move quick-start to an appendix
      glossary: expand and clarify some definitions, prune cross-references
      user-manual: revise birdseye-view chapter
      Add a birdview-on-the-source-code section to the user manual
    authored May 18, 2007
  12. Documentation: git-rev-list's "patterns"

    git-rev-list(1) talks about patterns as values for the
    --grep, --committed etc. parameters, without going into detail.
    This patch mentions that these patterns are actually regexps.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 19, 2007 Junio C Hamano committed May 18, 2007

May 18, 2007

  1. user-manual: reorganize public git repo discussion

    Helping a couple people set up public repos recently, I wanted to point
    them at this piece of the user manual, but found it wasn't as helpful as
    it could be:
    
    	- It starts with a big explanation of why you'd want a public
    	  repository, not necessary in their case since they already knew
    	  why they wanted that.  So, separate that out.
    	- It skimps on some of the git-daemon details, and puts the http
    	  export information first.  Fix that.
    
    Also group all the public repo subsections into a single section, and do
    some miscellaneous related editing.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 15, 2007
  2. user-manual: listing commits reachable from some refs not others

    This is just an amusing example raised by someone in irc.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 13, 2007
  3. user-manual: introduce git

    Well, we should say at least something about what git is.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 13, 2007
  4. user-manual: add a "counting commits" example

    This is partly just an excuse to mention --pretty= and rev-list.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 13, 2007
  5. user-manual: move howto/using-topic-branches into manual

    Move howto/using-topic-branches into the user manual as an example for
    the "sharing development" chapter.  While we're at it, remove some
    discussion that's covered in earlier chapters, modernize somewhat (use
    separate-heads setup, remotes, replace "whatchanged" by "log", etc.),
    and replace syntax we'd need to explain by syntax we've already covered
    (e.g. old..new instead of new ^old).
    
    The result may not really describe what Tony Luck does any more.... Hope
    that's not annoying.
    
    Cc: Tony Luck <tony.luck@intel.com>
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 13, 2007
  6. user-manual: move howto/make-dist.txt into user manual

    There seems to be a perception that the howto's are bit-rotting a
    little.  The manual might be a more visible location for some of them,
    and make-dist.txt seems like a good candidate to include as an example
    in the manual.
    
    For now, incorporate much of it verbatim.  Later we may want to update
    the example a bit.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 13, 2007
  7. Documentation: remove howto's now incorporated into manual

    These two howto's have both been copied into the manual.  I'd rather not
    maintain both versions if possible, and I think the user-manual will be
    more visible than the howto directory.  (Though I wouldn't mind some
    duplication if people really like having them here.)
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 12, 2007
  8. user-manual: move quick-start to an appendix

    The quick start interrupts the flow of the manual a bit.  Move it to
    "appendix A" but add a reference to it in the preface.  Also rename the
    todo chapter to "appendix B", and revise the preface a little.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 12, 2007
  9. glossary: expand and clarify some definitions, prune cross-references

    Revise and expand some of the definitions in the glossary, based in part
    on a recent thread started by a user looking for help with some of the
    jargon.  I've borrowed some of the language from Linus's email on that
    thread.  (I'm assuming standing permission to plagiarize Linus's
    email....)
    
    Also start making a few changes to mitigate the appearance of
    "circularity" mentioned in that thread:
    	- feel free to use somewhat longer definitions and to explain
    	  some things more than once instead of relying purely on
    	  cross-references
    	- don't use cross-references when they're redundant: eliminate
    	  self-references and repeated references to the same entry.
    
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 12, 2007
  10. user-manual: revise birdseye-view chapter

    Some revisions suggested by Junio along with some minor style fixes and
    one compile fix (asterisks need escaping).
    
    Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    authored May 12, 2007
  11. Michael Hendricks

    Document core.excludesfile for git-add

    During the discussion of core.excludesfile in the user-manual, I realized
    that the configuration wasn't mentioned in the man pages.
    
    Signed-off-by: Michael Hendricks <michael@ndrix.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 16, 2007 Junio C Hamano committed May 17, 2007

May 17, 2007

  1. Michael Hendricks

    git-send-email: allow leading white space on mutt aliases

    mutt version 1.5.14 (perhaps earlier versions too) permits alias files to have
    white space before the 'alias' keyword.
    
    Signed-off-by: Michael Hendricks <michael@ndrix.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 16, 2007 Junio C Hamano committed May 16, 2007
  2. dscho

    Add a birdview-on-the-source-code section to the user manual

    In http://thread.gmane.org/gmane.comp.version-control.git/42479,
    a birdview on the source code was requested.
    
    J. Bruce Fields suggested that my reply should be included in the
    user manual, and there was nothing of an outcry, so here it is,
    not 2 months later.
    
    It includes modifications as suggested by J. Bruce Fields, Karl
    Hasselström and Daniel Barkalow.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    authored May 10, 2007 J. Bruce Fields committed May 16, 2007

May 16, 2007

  1. Jeff King

    format-patch: add MIME-Version header when we add content-type.

    When we add Content-Type: header, we should also add
    MIME-Version: header as well.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 15, 2007 Junio C Hamano committed May 16, 2007
  2. sprohaska

    Fixed link in user-manual

    link to git-mergetool was broken.
    
    Signed-off-by: Steffen Prohaska <prohaska@zib.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 16, 2007 Junio C Hamano committed May 16, 2007
  3. Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint

    * 'maint' of git://repo.or.cz/git/fastimport:
      import-tars: Use the "Link indicator" to identify directories
    authored May 16, 2007
  4. dscho

    import-tars: Use the "Link indicator" to identify directories

    Earlier, we used the mode to determine if a name was associated with
    a directory. This fails, since some tar programs do not set the mode
    correctly. However, the link indicator _has_ to be set correctly.
    
    Noticed by Chris Riddoch.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Acked-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    authored May 16, 2007 spearce committed May 16, 2007
  5. Andy Whitcroft

    git name-rev writes beyond the end of malloc() with large generations

    When using git name-rev on my kernel tree I triggered a malloc()
    corruption warning from glibc.
    
    apw@pinky$ git log --pretty=one $N/base.. | git name-rev --stdin
    *** glibc detected *** malloc(): memory corruption: 0x0bff8950 ***
    Aborted
    
    This comes from name_rev() which is building the name of the revision
    in a malloc'd string, which it sprintf's into:
    
    	char *new_name = xmalloc(len + 8);
    	[...]
    		sprintf(new_name, "%.*s~%d^%d", len, tip_name,
    				generation, parent_number);
    
    This allocation is only sufficient if the generation number is
    less than 5 digits, in my case generation was 13432.  In reality
    parent_number can be up to 16 so that also can require two digits,
    reducing us to 3 digits before we are at risk of blowing this
    allocation.
    
    This patch introduces a decimal_length() which approximates the
    number of digits a type may hold, it produces the following:
    
    Type                 Longest Value          Len  Est
    ----                 -------------          ---  ---
    unsigned char        256                      3    4
    unsigned short       65536                    5    6
    unsigned long        4294967296              10   11
    unsigned long long   18446744073709551616    20   21
    char                 -128                     4    4
    short                -32768                   6    6
    long                 -2147483648             11   11
    long long            -9223372036854775808    20   21
    
    This is then used to size the new_name.
    
    Signed-off-by: Andy Whitcroft <apw@shadowen.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 15, 2007 Junio C Hamano committed May 15, 2007

May 15, 2007

  1. qt

    Documentation/branch: fix small typo in -D example

    Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 15, 2007 Junio C Hamano committed May 14, 2007
  2. Prepare for 1.5.1.5 Release Notes

    Hopefully we will have 1.5.2 soonish, to contain all of these,
    but we should summarize what we have done regardless.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 14, 2007
  3. Jakub Narębski

    gitweb: Add a few comments about %feature hash

    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 15, 2007 Junio C Hamano committed May 14, 2007
Something went wrong with that request. Please try again.