Permalink
Commits on May 19, 2007
  1. GIT v1.5.1.5

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

    Junio C Hamano committed May 19, 2007
    * '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
  3. Documentation: git-rev-list's "patterns"

    Petr Baudis committed with Junio C Hamano May 18, 2007
    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>
Commits on May 18, 2007
  1. user-manual: reorganize public git repo discussion

    J. Bruce Fields committed May 15, 2007
    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>
  2. user-manual: listing commits reachable from some refs not others

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

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

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

    J. Bruce Fields committed May 13, 2007
    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>
  6. user-manual: move howto/make-dist.txt into user manual

    J. Bruce Fields committed May 13, 2007
    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>
  7. Documentation: remove howto's now incorporated into manual

    J. Bruce Fields committed May 13, 2007
    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>
  8. user-manual: move quick-start to an appendix

    J. Bruce Fields committed May 13, 2007
    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>
  9. glossary: expand and clarify some definitions, prune cross-references

    J. Bruce Fields committed May 13, 2007
    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>
  10. user-manual: revise birdseye-view chapter

    J. Bruce Fields committed May 12, 2007
    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>
  11. Document core.excludesfile for git-add

    mndrix committed with Junio C Hamano May 17, 2007
    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>
Commits on May 17, 2007
  1. git-send-email: allow leading white space on mutt aliases

    mndrix committed with Junio C Hamano May 17, 2007
    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>
  2. Add a birdview-on-the-source-code section to the user manual

    dscho committed with J. Bruce Fields May 10, 2007
    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>
Commits on May 16, 2007
  1. format-patch: add MIME-Version header when we add content-type.

    peff committed with Junio C Hamano May 15, 2007
    When we add Content-Type: header, we should also add
    MIME-Version: header as well.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fixed link in user-manual

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

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

    dscho committed with spearce May 16, 2007
    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>
  5. git name-rev writes beyond the end of malloc() with large generations

    awhitcroft committed with Junio C Hamano May 15, 2007
    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>
Commits on May 15, 2007
  1. Documentation/branch: fix small typo in -D example

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

    Junio C Hamano committed May 15, 2007
    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>
  3. gitweb: Add a few comments about %feature hash

    jnareb committed with Junio C Hamano May 14, 2007
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-am: Clean up the asciidoc documentation

    flichtenheld committed with Junio C Hamano May 14, 2007
    Add --keep to synopsis.
    
    The synopsys used a mix of tabs and spaces, unify to use only
    spaces.
    
    Shuffle options around in synopsys and description for grouping
    them logically.
    
    Add more gitlink references to other commands.
    
    Various grammatical fixes and improvements.
    
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Documentation: format-patch has no --mbox option

    flichtenheld committed with Junio C Hamano May 14, 2007
    git-applymbox and git-mailinfo refer to a --mbox option of
    git-format-patch when talking about their -k options. But there
    is no such option.  What -k does to the former two commands is
    to keep the Subject: lines unmunged, meant to be used on output
    generated with format-patch -k.
    
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 14, 2007
  1. builtin-log.c: Fix typo in comment

    flichtenheld committed with Junio C Hamano May 14, 2007
    s/fmt-patch/format-patch/
    
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fix git-clone buglet for remote case.

    Junio C Hamano committed May 14, 2007
    c2f599e introduced a buglet while
    cloning from a remote URL; we forgot to squelch the unnecessary
    error message when we try to cd to the given "remote" name,
    in order to see if it is a local directory.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 13, 2007
  1. git-svn: don't attempt to minimize URLs by default

    Eric Wong committed with Junio C Hamano May 13, 2007
    For tracking branches and tags, git-svn prefers to connect
    to the root of the repository or at least the level that
    houses branches and tags as well as trunk.  However, users
    that are accustomed to tracking a single directory have
    no use for this feature.
    
    As pointed out by Junio, users may not have permissions to
    connect to connect to a higher-level path in the repository.
    
    While the current minimize_url() function detects lack of
    permissions to certain paths _after_ successful logins, it
    cannot effectively determine if it is trying to access a
    login-only portion of a repo when the user expects to
    connect to a part where anonymous access is allowed.
    
    For people used to the git-svnimport switches of
    --trunk, --tags, --branches, they'll already pass the
    repository root (or root+subdirectory), so minimize URL
    isn't of too much use to them, either.
    
    For people *not* used to git-svnimport, git-svn also
    supports:
    
     git svn init --minimize-url \
      --trunk http://repository-root/foo/trunk \
      --branches http://repository-root/foo/branches \
      --tags http://repository-root/foo/tags
    
    And this is where the new --minimize-url command-line switch
    comes in to allow for this behavior to continue working.
  2. git-svn: fix segfaults due to initial SVN pool being cleared

    Eric Wong committed with Junio C Hamano May 13, 2007
    Some parts of SVN always seem to use it, even if the SVN::Ra
    object we're using is no longer used and we've created a new one
    in its place.  It's also true that only one SVN::Ra connection
    can exist at once...  Using SVN::Pool->new_default when the
    SVN::Ra object is created doesn't seem to help very much,
    either...
    
    Hopefully this fixes all segfault problems users have been
    experiencing over the past few months.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  3. git-svn: clean up caching of SVN::Ra functions

    Eric Wong committed with Junio C Hamano May 13, 2007
    This patch was originally intended to make the Perl GC more
    sensitive to the SVN::Pool objects and not accidentally clean
    them up when they shouldn't be (causing segfaults).  That didn't
    work, but this patch makes the code a bit cleaner regardless
    
    Put our caches for get_dir and check_path calls directly into
    the SVN::Ra object so they auto-expire when it is destroyed.
    
    dirents returned by get_dir() no longer needs the pool object
    stored persistently along with the cache data, as they'll be
    converted to native Perl hash references.
    
    Since calling rev_proplist repeatedly per-revision is no longer
    needed in git-svn, we do not cache calls to it.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  4. git-svn: don't drop the username from URLs when dcommit is run

    Eric Wong committed with Junio C Hamano May 12, 2007
    We no longer store usernames in URLs stored in git-svn-id lines
    for dcommit, so we shouldn't rely on those URLs when connecting
    to the remote repository to commit.
  5. RPM spec: include files in technical/ to package.

    qtonthat committed with Junio C Hamano May 13, 2007
    Not only that they are interesting to users, some of the
    files are linked to by the included "Git User's Manual"
    
    Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Remove stale non-static-inline prototype for tree_entry_extract()

    mat-c committed with Junio C Hamano May 13, 2007
    When 4651ece made the function a "static inline", it should
    have removd the stale prototype but everybody missed that.
    
    Thomas Glanzmann noticed this broke compilation with Forte12
    compiler on his Sun boxes.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. git-config: test for 'do not forget "a.b.var" ends "a.var" section'.

    sprohaska committed with Junio C Hamano May 13, 2007
    Added test for mentioned bugfix.
    
    Signed-off-by: Steffen Prohaska <prohaska@zib.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>