Permalink
Commits on Mar 28, 2007
  1. GIT 1.5.1-rc3

    Junio C Hamano committed Mar 28, 2007
  2. Update main git.html page to point at 1.5.0.6 documentation

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 28, 2007
  3. Merge branch 'maint' to synchronize with 1.5.0.6

    Junio C Hamano committed Mar 28, 2007
  4. GIT 1.5.0.6

    Junio C Hamano committed Mar 28, 2007
  5. 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
  6. 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 23, 2007
  7. t/t6006: add tests for a slightly more complex commit messages

    Especially this tests i18n messages and encoding 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
  8. Fix "--pretty=format:" encoding item

    It printed the header "encoding " instead of just showing
    the encoding, as all other items do.
    
    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
  9. Fix "--pretty=format:" for parent related items.

    There are two breakages in the %P/%p interpolation.  It appended
    an excess SP at the end of the list, and it gave uninitialized
    contents of a buffer on the stack for root commits.
    
    This fixes it, while updating the t6006 test which expected the
    wrong output.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 28, 2007
  10. http-fetch: remove path_len from struct alt_base, it was computed but…

    … never used
    
    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 28, 2007
  11. http-fetch: don't use double-slash as directory separator in URLs

    Please see http://bugs.debian.org/409887
    
    http-fetch expected the URL given at the command line to have a trailing
    slash anyway, and then added '/objects...' when requesting objects files
    from the http server.
    
    Now it doesn't require the trailing slash in <url> anymore, and strips
    trailing slashes if given nonetheless.
    
    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 28, 2007
  12. 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
  13. Add some basic tests of rev-list --pretty=format

    These could stand to be a little more complex, but it should
    at least catch obvious problems (like the recently fixed %ct
    bug).
    
    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
  14. 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>
    H. Peter Anvin committed with Junio C Hamano Mar 27, 2007
  15. --pretty=format: fix broken %ct and %at interpolation

    A pointer arithmetic error in fill_person caused random data
    from the commit object to be included with the timestamp,
    which looked something like:
    
        $ git-rev-list --pretty=format:%ct origin/next | head
        commit 98453bd
        1174977948 -0700
    
        Merge branch 'master' into next
    
        * master:
          Bisect: Use
        commit c0ce981
        1174889646 -0700
    
    Signed-off-by: Jeff King <peff@peff.net>
    Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    peff committed with Junio C Hamano Mar 27, 2007
Commits on Mar 27, 2007
  1. use xrealloc in help.c

    Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    James Bowes committed with Junio C Hamano Mar 27, 2007
  2. read-tree: use xcalloc

    Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    James Bowes committed with Junio C Hamano Mar 27, 2007
  3. Fix "getaddrinfo()" buglet

    At least in Linux glibc, "getaddrinfo()" has a very irritating feature (or
    bug, who knows..).
    
    Namely if you pass it in an empty string for the service name, it will
    happily and quietly consider it identical to a NULL port pointer, and
    return port number zero and no errors. Which obviously will not work.
    
    Maybe that's what it's really expected to do, although the man-page for
    getaddrinfo() certainly implies that it's a bug.
    
    So when somebody passes me a "please pull" request pointing to something
    like the following
    
    	git://git.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
    
    (note the extraneous colon at the end of the host name), git would happily
    try to connect to port 0, which would generally just cause the remote to
    not even answer, and the "connect()" will take a long time to time out.
    
    So to work around the glibc feature/bug, just notice this empty port case
    automatically. Also, add the port information to the error information
    when it fails to look up (maybe it's the host-name that fails, maybe it's
    the port-name - we should print out both).
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    torvalds committed with Junio C Hamano Mar 27, 2007
  4. Makefile: remove test-chmtime program in target clean.

    While running 'make test', the test-chmtime program is created, and should
    be cleaned up on 'make clean'.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Gerrit Pape committed with Junio C Hamano Mar 27, 2007
  5. gitweb: Cleanup and uniquify die_error calls

    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jnareb committed with Junio C Hamano Mar 27, 2007
  6. sha1_file.c (write_sha1_file): Detect close failure

    This is in the same spirit as earlier fix to write_sha1_from_fd().
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 27, 2007
  7. git.el: Display some information about the HEAD commit.

    Use git-log --pretty=oneline to print a short description of the
    current HEAD (and merge heads if any) in the buffer header.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    julliard committed with Junio C Hamano Mar 26, 2007
  8. Document git-log --first-parent

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 27, 2007
  9. Bisect: add checks at the beginning of "git bisect run".

    We may be able to "run" with only one good revision given
    and then verify that the result of the first run is bad.
    And perhaps also the other way around.
    
    But for now let's check that we have at least one bad and
    one good revision before we start to run.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    chriscool committed with Junio C Hamano Mar 27, 2007
  10. sha1_file.c (write_sha1_from_fd): Detect close failure.

    I stumbled across this in the context of the fchmod 0444 patch.
    At first, I was going to unlink and call error like the two subsequent
    tests do, but a failed write (above) provokes a "die", so I made
    this do the same.  This is testing for a write failure, after all.
    
    Signed-off-by: Jim Meyering <jim@meyering.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    meyering committed with Junio C Hamano Mar 26, 2007
  11. git-rm: don't remove newly added file without -f

    Given this set of commands:
    
      $ echo "newly added file" >new
      $ git add new
      $ git rm new
    
    the file "new" was previously removed from the working
    directory and the index. Because it was not in HEAD, it is
    available only by searching for unreachable objects.
    
    Instead, we now err on the safe side and refuse to remove
    a file which is not referenced by HEAD.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    peff committed with Junio C Hamano Mar 26, 2007
Commits on Mar 26, 2007
  1. Bisect: Use "git-show-ref --verify" when reseting.

    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    chriscool committed with Junio C Hamano Mar 26, 2007
  2. gitweb: Add example of config file and how to generate projects list …

    …to gitweb/INSTALL
    
    Add simple example of config file (turning on and allowing override of
    a few %features). Also example config file and script to generate list
    of projects in a format that can be used as GITWEB_LIST / $projects_list.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jnareb committed with Junio C Hamano Mar 26, 2007
  3. GIT 1.5.1-rc2

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 26, 2007
  4. git-svn: fix rel_path() when not connected to the repository root

    This should fix fetching for people who did not use
    "git svn --minimize" or cannot connect to the repository root
    due to the lack of permissions.
    
    I'm not sure what I was on when I made the change to the
    rel_path() function in 4e9f6cc
    that made it die() when we weren't connected to the repository
    root :x
    
    Thanks to Sven Verdoolaege for reporting this bug.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Eric Wong committed with Junio C Hamano Mar 25, 2007
  5. use xmalloc in git.c and help.c

    Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    James Bowes committed with Junio C Hamano Mar 26, 2007
  6. Merge branch 'jc/fpl'

    * jc/fpl:
      git-log --first-parent: show only the first parent log
    Junio C Hamano committed Mar 26, 2007
  7. Update README to point at a few key periodical messages to the list

    They give a good starting point to new people who want to get
    involved.  This owes suggestions by Martin Langhoff and Steven
    Grimm.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Mar 26, 2007
Commits on Mar 25, 2007
  1. Merge branch 'maint'

    * maint:
      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. 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