Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.5.0-rc4
Commits on Feb 7, 2007
  1. GIT v1.5.0-rc4

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Documentation: Add gfi to the main command list.

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Linus Torvalds

    Fix "git log -z" behaviour

    torvalds authored Junio C Hamano committed
    For commit messages, we should really put the "line_termination" when we
    output the character in between different commits, *not* between the
    commit and the diff. The diff goes hand-in-hand with the commit, it
    shouldn't be separated from it with the termination character.
    
    So this:
     - uses the termination character for true inter-commit spacing
     - uses a regular newline between the commit log and the diff
    
    We had it the other way around.
    
    For the normal case where the termination character is '\n', this
    obviously doesn't change anything at all, since we just switched two
    identical characters around. So it's very safe - it doesn't change any
    normal usage, but it definitely fixes "git log -z".
    
    By fixing "git log -z", you can now also do insane things like
    
    	git log -p -z |
    		grep -z "some patch expression" |
    		tr '\0' '\n' |
    		less -S
    
    and you will see only those commits that have the "some patch expression"
    in their commit message _or_ their patches.
    
    (This is slightly different from 'git log -S"some patch expression"',
    since the latter requires the expression to literally *change* in the
    patch, while the "git log -p -z | grep .." approach will see it if it's
    just an unchanged _part_ of the patch context)
    
    Of course, if you actually do something like the above, you're probably
    insane, but hey, it works!
    
    Try the above command line for a demonstration (of course, you need to
    change the "some patch expression" to be something relevant). The old
    behaviour of "git log -p -z" was useless (and got things completely wrong
    for log entries without patches).
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-add -i: update removed path correctly.

    Junio C Hamano authored
    Earlier, when a path that was removed from the working tree was
    chosen for update subcommand, you got an error like this:
    
        error: git-resolve.sh: does not exist and --remove not passed
        fatal: Unable to process file git-resolve.sh
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. t4200: skip gc-rerere test on systems with non GNU date.

    Junio C Hamano authored
    Quite nonstandard "date -d @11111111 +%s" does not even fail on
    OpenBSD but gives the current date in "seconds since epoch"
    format, which is useless for the purpose of this test.  We want
    to make sure that this returns exactly the same input before
    proceeding.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Merge branch 'ml/gitk' (early part)

    Junio C Hamano authored
    * 'ml/gitk' (early part):
      gitk: Use show-ref instead of ls-remote
      Make gitk work reasonably well on Cygwin.
      gitk - remove trailing whitespace from a few lines.
  7. dscho

    fast-import: Fix compile warnings

    dscho authored Junio C Hamano committed
    Not on all platforms are size_t and unsigned long equivalent.
    Since I do not know how portable %z is, I play safe, and just
    cast the respective variables to unsigned long.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. for-each-reflog: fix case for empty log directory

    Junio C Hamano authored
    When we remove the last reflog in a directory, opendir() would
    succeed and we would iterate over its dirents, expecting retval
    to be initialized to zero and setting it to non-zero only upon
    seeing an error.  If the directory is empty, oops!, we do not
    have anybody that touches retval.
    
    The problem is because we initialize retval to errno even on
    success from opendir(), which would leave the errno unmolested.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. Merge branch 'master' of git://repo.or.cz/git/fastimport

    Junio C Hamano authored
    * 'master' of git://repo.or.cz/git/fastimport:
      Add a Tips and Tricks section to fast-import's manual.
      Don't crash fast-import if the marks cannot be exported.
      Dump all refs and marks during a checkpoint in fast-import.
      Teach fast-import how to sit quietly in the corner.
      Teach fast-import how to clear the internal branch content.
      Minor timestamp related documentation corrections for fast-import.
  10. git-clone --reference: work well with pack-ref'ed reference repository

    Junio C Hamano authored
    Earlier we only used loose refs to anchor already existing
    objects.  When cloning from a repository that forked relatively
    long time ago from the reference repository, this made the
    want/have exchange by fetch-pack to do unnecessary work.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Shawn O. Pearce

    Add a Tips and Tricks section to fast-import's manual.

    spearce authored
    There has been some informative lessons learned in the gfi user
    community, and these really should be written down and documented
    for future generations of frontend developers.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  12. Alex Riesen

    Avoid ActiveState Perl IO in t800[12]

    raalkml authored Junio C Hamano committed
    Use sed instead, it comes with cygwin and there is almost no chance of
    someone installing a sed with default CRLF lineendings by accident.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. Documentation: add KMail in SubmittingPatches

    Michael authored Junio C Hamano committed
    Signed-off-by: Michael <barra_cuda@katamail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. Shawn O. Pearce

    Don't crash fast-import if the marks cannot be exported.

    spearce authored
    Apparently fast-import used to die a horrible death if we
    were unable to open the marks file for output.  This is
    slightly less than ideal, especially now that we dump
    the marks as part of the `checkpoint` command.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  15. Shawn O. Pearce

    Dump all refs and marks during a checkpoint in fast-import.

    spearce authored
    If the frontend asks us to checkpoint (via the explicit checkpoint
    command) its probably because they are afraid the current import
    will crash/fail/whatever and want to make sure they can pickup from
    the last checkpoint.  To do that sort of recovery, we will need the
    current tip of every branch and tag available at the next startup.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  16. Shawn O. Pearce

    Teach fast-import how to sit quietly in the corner.

    spearce authored
    Often users will be running fast-import from within a larger frontend
    process, and this may be a frequent periodic tool such as a future
    edition of `git-svn fetch`.  We don't want to bombard users with our
    large stats output if they won't be interested in it, so `--quiet`
    is now an option to make gfi be more silent.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  17. Shawn O. Pearce

    Teach fast-import how to clear the internal branch content.

    spearce authored
    Some frontends may not be able to (easily) keep track of which files
    are included in the branch, and which aren't.  Performing this
    tracking can be tedious and error prone for the frontend to do,
    especially if its foreign data source cannot supply the changed
    path list on a per-commit basis.
    
    fast-import now allows a frontend to request that a branch's tree
    be wiped clean (reset to the empty tree) at the start of a commit,
    allowing the frontend to feed in all paths which belong on the branch.
    
    This is ideal for a tar-file importer frontend, for example, as
    the frontend just needs to reformat the tar data stream into a gfi
    data stream, which may be something a few Perl regexps can take
    care of. :)
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  18. Shawn O. Pearce

    Minor timestamp related documentation corrections for fast-import.

    spearce authored
    As discussed on the mailing list, the documentation used here was
    not quite accurate.  Improve upon it.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  19. Remove git-merge-recur

    Junio C Hamano authored
    This was useful when the current recursive was in development, and
    the original Python version was still called git-merge-recursive.
    
    Now the synonym has served us well, it is time to move on.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  20. Add deprecation notices.

    Junio C Hamano authored
    Schedule git-diff-stages and git-resolve to be removed by 1.5.1
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  21. Merge branch 'master' of git://repo.or.cz/git/fastimport

    Junio C Hamano authored
    * 'master' of git://repo.or.cz/git/fastimport: (81 commits)
      S_IFLNK != 0140000
      Don't do non-fastforward updates in fast-import.
      Support RFC 2822 date parsing in fast-import.
      Minor fast-import documentation corrections.
      Remove unnecessary null pointer checks in fast-import.
      Correct fast-import timezone documentation.
      Correct minor style issue in fast-import.
      Correct compiler warnings in fast-import.
      Remove --branch-log from fast-import.
      Initial draft of fast-import documentation.
      Don't support shell-quoted refnames in fast-import.
      Reduce memory usage of fast-import.
      Include checkpoint command in the BNF.
      Accept 'inline' file data in fast-import commit structure.
      Reduce value duplication in t9300-fast-import.
      Create test case for fast-import.
      Support delimited data regions in fast-import.
      Remove unnecessary options from fast-import.
      Use fixed-size integers when writing out the index in fast-import.
      Always use struct pack_header for pack header in fast-import.
      ...
  22. Remove contrib/colordiff

    Junio C Hamano authored
    This has completely been superseded by built-in --color option.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Feb 6, 2007
  1. Horst H. von Brand

    Call make always with CFLAGS in git.spec

    vonbrand authored Junio C Hamano committed
    If not, the binaries get built once with the correct CFLAGS, and then again
    with the ones in the Makefile when installing
    
    Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. add replay and log to the usage string of git-bisect

    Uwe Kleine-König authored Junio C Hamano committed
    Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Shawn O. Pearce

    S_IFLNK != 0140000

    Junio C Hamano authored spearce committed
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  4. Shawn O. Pearce

    Don't do non-fastforward updates in fast-import.

    spearce authored
    If fast-import is being used to update an existing branch of
    a repository, the user may not want to lose commits if another
    process updates the same ref at the same time.  For example, the
    user might be using fast-import to make just one or two commits
    against a live branch.
    
    We now perform a fast-forward check during the ref updating process.
    If updating a branch would cause commits in that branch to be lost,
    we skip over it and display the new SHA1 to standard error.
    
    This new default behavior can be overridden with `--force`, like
    git-push and git-fetch.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  5. Shawn O. Pearce

    Support RFC 2822 date parsing in fast-import.

    spearce authored
    Since some frontends may be working with source material where
    the dates are only readily available as RFC 2822 strings, it is
    more friendly if fast-import exposes Git's parse_date() function
    to handle the conversion.  This way the frontend doesn't need
    to perform the parsing itself.
    
    The new --date-format option to fast-import can be used by a
    frontend to select which format it will supply date strings in.
    The default is the standard `raw` Git format, which fast-import
    has always supported.  Format rfc2822 can be used to activate the
    parse_date() function instead.
    
    Because fast-import could also be useful for creating new, current
    commits, the format `now` is also supported to generate the current
    system timestamp.  The implementation of `now` is a trivial call
    to datestamp(), but is actually a whole whopping 3 lines so that
    fast-import can verify the frontend really meant `now`.
    
    As part of this change I have added validation of the `raw` date
    format.  Prior to this change fast-import would accept anything
    in a `committer` command, even if it was seriously malformed.
    Now fast-import requires the '> ' near the end of the string and
    verifies the timestamp is formatted properly.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  6. Shawn O. Pearce

    Minor fast-import documentation corrections.

    spearce authored
    Corrected a couple of header markup lines which were shorter than the
    actual header, and made the `data` commands two formats into a named
    list, which matches how we document the two formats of the `M` command
    within a commit.
    
    Also tried to simplify the language about our decimal integer format;
    Linus pointed out I was probably being too specific at the cost of
    reduced readability.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  7. Shawn O. Pearce

    Remove unnecessary null pointer checks in fast-import.

    spearce authored
    There is no need to check for a NULL pointer before invoking free(),
    the runtime library automatically performs this check anyway and
    does nothing if a NULL pointer is supplied.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  8. Shawn O. Pearce

    Correct fast-import timezone documentation.

    spearce authored
    Andy Parkins and Linus Torvalds both noticed that the description
    of the timezone was incorrect.  Its not expressed in minutes.
    Its more like "hhmm", where "hh" is the number of hours and "mm"
    is the number of minutes shifted from GMT/UTC.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  9. annotate: fix for cvsserver.

    Junio C Hamano authored
    git-cvsserver does not want the boundary commits shown any differently.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. gitweb: fix mismatched parenthesis

    Junio C Hamano authored
    An earlier commit 0417941 broke gitweb.  Badly.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. git-push: allow globbing wildcard refspec.

    Junio C Hamano authored
    This allows you to set up mothership-satellite configuration
    more symmetrically and naturally by allowing the globbing
    wildcard refspec for git-push.  On your satellite machine:
    
        [remote "mothership"]
            url = mothership:project.git
            fetch = refs/heads/*:refs/remotes/mothership/*
            push = refs/heads/*:refs/remotes/satellite/*
    
    You would say "git fetch mothership" to update your tracking
    branches under mothership/ to keep track of the progress on the
    mothership side, and when you are done working on the satellite
    machine, you would "git push mothership" to update their
    tracking branches under satellite/.  Corresponding configuration
    on the mothership machine can be used to make "git fetch satellite"
    update its tracking branch under satellite/. on the mothership.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. Shawn O. Pearce

    Correct minor style issue in fast-import.

    spearce authored
    Junio noticed that I was using a different style in fast-import
    for returned pointers than the rest of Git.  Before merging this
    code into the main git.git tree I'd like to make it consistent,
    as this style variation was not intentional.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  13. Shawn O. Pearce

    Correct compiler warnings in fast-import.

    spearce authored
    Junio noticed these warnings/errors in fast-import when compiling
    with `-Werror -ansi -pedantic`.  A few changes are to reduce compiler
    warnings, while one (in cmd_merge) is a bug fix.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Something went wrong with that request. Please try again.