Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.5.3-rc2

Jul 15, 2007

  1. Junio C Hamano

    GIT v1.5.3-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 15, 2007
  2. Sean

    Demote git-p4import to contrib status.

    Move git-p4import.py and Documentation/git-p4import.txt into
    a contrib/p4import directory.   Add a README there directing
    people to contrib/fast-import/git-p4 as a better alternative.
    
    Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 15, 2007 gitster committed July 15, 2007
  3. Sean

    Remove p4 rpm from git.spec.in.

    Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 15, 2007 gitster committed July 15, 2007
  4. Sean

    Remove "WITH_P4IMPORT" knob from the Makefile

    Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 15, 2007 gitster committed July 15, 2007
  5. meyering

    git-cvsserver: detect/diagnose write failure, etc.

    There were many operations that did not notice and report errors
    to the CVS client, which would have resulted in corrupt working
    tree.
    
    Signed-off-by: Jim Meyering <jim@meyering.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 14, 2007 gitster committed July 14, 2007
  6. Use $(RM) in Makefiles instead of 'rm -f'

    Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 14, 2007 gitster committed July 14, 2007
  7. Junio C Hamano

    Merge branch 'master' of git://repo.or.cz/git/fastimport

    * 'master' of git://repo.or.cz/git/fastimport:
      Teach fast-import to recursively copy files/directories
      Fix git-p4 on Windows to not use the Posix sysconf function.
      Correct trivial typo in fast-import documentation
    authored July 14, 2007
  8. Junio C Hamano

    Documentation/git-commit-tree: remove description of a nonexistent li…

    …mitation
    
    Noticed by Geoff Richards.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 14, 2007
  9. Make every builtin-*.c file #include "builtin.h"

    Make every builtin-*.c file #include "builtin.h".
    
    Also takes care of some declaration/definition mismatches.
    
    Signed-off-by: Peter Hagervall <hager@cs.umu.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 15, 2007 gitster committed July 14, 2007
  10. Shawn O. Pearce

    Teach fast-import to recursively copy files/directories

    Some source material (e.g. Subversion dump files) perform directory
    renames by telling us the directory was copied, then deleted in the
    same revision.  This makes it difficult for a frontend to convert
    such data formats to a fast-import stream, as all the frontend has
    on hand is "Copy a/ to b/; Delete a/" with no details about what
    files are in a/, unless the frontend also kept track of all files.
    
    The new 'C' subcommand within a commit allows the frontend to make a
    recursive copy of one path to another path within the branch, without
    needing to keep track of the individual file paths.  The metadata
    copy is performed in memory efficiently, but is implemented as a
    copy-immediately operation, rather than copy-on-write.
    
    With this new 'C' subcommand frontends could obviously implement an
    'R' (rename) on their own as a combination of 'C' and 'D' (delete),
    but since we have already offered up 'R' in the past and it is a
    trivial thing to keep implemented I'm not going to deprecate it.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    authored July 15, 2007
  11. Fix git-p4 on Windows to not use the Posix sysconf function.

    Add condition for Windows, since it doesn't support the os.sysconf module.
    We hardcode the commandline limit to 2K, as that should work on most
    Windows platforms.
    
    Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
    Acked-by: Simon Hausmann <simon@lst.de>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    authored July 13, 2007 spearce committed July 14, 2007

Jul 14, 2007

  1. git-svn: remove leading slashes from fetch lines in the generate config

    We were previously sensitive to leading slashes in the fetch
    lines and incorrectly writing them to the config if the user
    used them (needlessly) in the command-line.
    
    This fixes the issue and allows us to play nicely with legacy
    configs that have leading slashes in fetch lines.
    
    Thanks to Bradford Smith for figuring this out for me:
    >
    > This works:
    >
    > git-svn clone https://my.server.net/repos/path/ -Ttrunk/testing
    >   -ttags/testing -bbranches/testing testing
    >
    > This doesn't:
    >
    > git-svn clone https://my.server.net/repos/path -T/trunk/testing
    >   -t/tags/testing -b/branches/testing testing
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 14, 2007 gitster committed July 14, 2007
  2. Junio C Hamano

    Update .mailmap

    The script "contrib/stats/mailmap.pl" found a few missed ones.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 14, 2007
  3. Junio C Hamano

    Add contrib/stats/mailmap.pl script

    This script reads the existing commit log and .mailmap file,
    and outputs author e-mail addresses that would map to more
    than one names (most likely due to difference in the way they
    are spelled, but some are due to ancient botched commits).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 14, 2007
  4. Remove useless uses of cat, and replace with filename arguments

    Replace uses of cat that do nothing but writing the contents of
    a single file to another command via pipe.
    
    [jc: Original patch from Josh was somewhat buggy and rewrote
    "cat $file | wc -l" to "wc -l $file", but this one should be Ok.]
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 14, 2007 gitster committed July 14, 2007
  5. Matthieu Moy

    More permissive "git-rm --cached" behavior without -f.

    In the previous behavior, "git-rm --cached" (without -f) had the same
    restriction as "git-rm". This forced the user to use the -f flag in
    situations which weren't actually dangerous, like:
    
    $ git add foo           # oops, I didn't want this
    $ git rm --cached foo   # back to initial situation
    
    Previously, the index had to match the file *and* the HEAD. With
    --cached, the index must now match the file *or* the HEAD. The behavior
    without --cached is unchanged, but provides better error messages.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 13, 2007 gitster committed July 13, 2007
  6. Junio C Hamano

    Document new --date=<format>

    Now, git-log family can take full range of internally supported date format
    to their --date=<format> argument.  Document it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 13, 2007
  7. Junio C Hamano

    Wire new date formats to --date=<format> parser.

    Now we can use all internally supported date formats with
    
    	git log --date=<format>
    
    syntax.  Earlier, we only allowed relative/local/default.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 13, 2007
  8. Junio C Hamano

    Make show_rfc2822_date() just another date output format.

    These days, show_date() takes a date_mode parameter to specify
    the output format, and a separate specialized function for dates
    in E-mails does not make much sense anymore.
    
    This retires show_rfc2822_date() function and make it just
    another date output format.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 13, 2007
  9. Robin Roenberg

    Support output ISO 8601 format dates

    Support output of full ISO 8601 style dates in e.g. git log
    and other places that use interpolation for formatting.
    
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 14, 2007 gitster committed July 13, 2007
  10. Junio C Hamano

    Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

    * 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Fix bug introduced by previous commit
    authored July 13, 2007
  11. Fix git-rebase -i to allow squashing of fast-forwardable commits

    Without this change the commits will be left standalone, with
    duplicated commit message.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 13, 2007 gitster committed July 13, 2007

Jul 13, 2007

  1. lockfile.c: schedule remove_lock_file only once.

    Removing a lockfile once should be enough.
    
    Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 13, 2007 gitster committed July 13, 2007
  2. send-email: discard blank around address in extract_valid_address as …

    …well.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 13, 2007 gitster committed July 13, 2007
  3. Greg Kroah-Hartman

    make git-send-email.perl handle email addresses with no names when Em…

    …ail::Valid is present
    
    When using git-send-email.perl on a changeset that has:
    	Cc: <stable@kernel.org>
    in the body of the description, and the Email::Valid perl module is
    installed on the system, the email address will be deemed "invalid" for
    some reason (Email::Valid isn't smart enough to handle this?) and
    complain and not send the address the email.
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 12, 2007 gitster committed July 12, 2007
  4. Paul Mackerras

    gitk: Fix bug introduced by previous commit

    When I added the "--" case to the code scanning the arguments, I missed
    the fact that since the switch statement uses -regexp, the "--" case
    will match any argument containing "--", e.g. "--all".  This fixes it
    by taking out the -regexp (since we don't actually need regular
    expression matching) and adjusting the match strings.
    
    A side effect of this is that previously any argument starting with
    "-d" would be taken to indicate date mode; now the argument has to be
    exactly "-d" if you want date mode.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    authored July 13, 2007
  5. Jakub Narębski

    Document git commit --untracked-files and --verbose

    Documentation based on description of commit 443f833 which added
    '-u'|'--untracked-files' option to git-status, and on git-runstatus(1)
    man page.
    
    Note that those options apply also to git-status.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 13, 2007 gitster committed July 12, 2007
  6. Jakub Narębski

    Document long options '--message=<msg>' and '--no-commit'

    Document that '--message=<msg>' is long version of '-m <msg>' in
    git-commit, and that '--no-checkout' is long version of '-n' in
    git-clone.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 13, 2007 gitster committed July 12, 2007
  7. Jakub Narębski

    Update git-merge documentation.

    Add "Configuration" section to describe merge.summary
    configuration variable (which is mentioned in git-fmt-merge-msg(1)
    man page, but it is a plumbing command), and merge.verbosity
    configuration variable (so there is a place to make reference
    from "Environment Variables" section of git(7) man page) to the
    git-merge(1) man page.  Also describe GIT_MERGE_VERBOSITY
    environment.
    
    The configuration variable merge.verbosity and environment variable
    GIT_MERGE_VERBOSITY were introduced in commit 8c3275a, which also
    documented configuration variable but not environment variable.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 13, 2007 gitster committed July 12, 2007
  8. Pack-objects: properly initialize the depth value

    Commit 5a235b5 was missing this little detail.  Otherwise your pack
    will explode.
    
    Problem noted by Brian Downing.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 12, 2007 gitster committed July 12, 2007

Jul 12, 2007

  1. Junio C Hamano

    GIT v1.5.3-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 12, 2007
  2. Junio C Hamano

    Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

    * 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Improve handling of -- and ambiguous arguments
      gitk: Use git log and add support for --left-right
      gitk: Fix bug causing "can't read commitrow(0,n)" error
      [PATCH] gitk: Fix for tree view ending in nested directories
      gitk: Remove the unused stopfindproc function
      gitk: Fix bug in the anc_or_desc routine
      gitk: Fix the find and highlight functions
    authored July 12, 2007
  3. Miklos Vajna

    gitweb: new cgi parameter: opt

    Currently the only supported value is '--no-merges' for the 'rss', 'atom',
    'log', 'shortlog' and 'history' actions, but it can be easily extended to allow
    other parameters for other actions.
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 12, 2007 gitster committed July 12, 2007
  4. Add missing functions to contrib/emacs/vc-git.el

    This is necessary to make several editing functions work, like
    C-u C-x v =
    
    Signed-off-by: David Kastrup <dak@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 12, 2007 gitster committed July 12, 2007
  5. Steven Walter

    Documentation for git-log --follow

    After vainly searching the Documentation for how to follow renames, I
    finally broke down and grepped the source.  It would appear that Linus
    didn't add write and docs for this feature when he wrote it.  The
    following patch rectifies that, hopefully sparing future users from
    resorting to the source code.
    
    Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 12, 2007 gitster committed July 12, 2007
Something went wrong with that request. Please try again.