Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v0.99.8a

Oct 03, 2005

  1. GIT 0.99.8a

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  2. Jonas Fonseca

    [PATCH] Random documentation fixes

    The fixes focuses on improving the HTML output. Most noteworthy:
    
     - Fix the Makefile to also make various *.html files depend on
       included files.
    
     - Consistently use 'NOTE: ...' instead of '[ ... ]' for additional
       info.
    
     - Fix ending '::' for description lists in OPTION section etc.
    
     - Fix paragraphs in description lists ending up as preformated text.
    
     - Always use listingblocks (preformatted text wrapped in lines with -----)
       for examples that span empty lines, so they are put in only one HTML
       block.
    
     - Use '1.' instead of '(1)' for numbered lists.
    
     - Fix linking to other GIT docs.
    
     - git-rev-list.txt: put option descriptions in an OPTION section.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jonas authored Junio C Hamano committed
  3. Error message from get_sha1() on ambiguous short SHA1.

    Unlike cases where "no such object exists", the case where specified
    prefix is ambiguous would confuse the user if we say "no such commit"
    or such.  Give an extra error message from the uniqueness check if
    there are more than one objects that match the given prefix.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  4. [PATCH] Enable and fix support for base less merges.

    Let the merge strategies handle the base less case if they are able to
    do it. It also fixes git-resolve.sh to die if no common ancestors
    exists, instead of doing the wrong thing. Furthermore, it contains a
    small independent fix for git-merge.sh and a fix for a base less code
    path in gitMergeCommon.py.
    
    With this it's possible to use
        git merge -s recursive 'merge message' A B
    to do a base less merge of A and B.
    
    [jc: Thanks Fredrik for fixing the brown-paper-bag in git-merge.
     I fixed a small typo in git-merge-resolve fix; 'test' equality
     check is spelled with single equal sign -- C-style double equal
     sign is bashism.]
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Fredrik Kuivinen authored Junio C Hamano committed
  5. Make sure get_sha1 does not accept ambiguous sha1 prefix.

    The original code did not even check alternates, and was confused if
    an unpacked object was uniquely found when there was another object
    that shares the same prefix in the pack.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  6. Fix minor DOS in rev-list.

    A carefully crafted pathname can be used to disrupt downstream git-pack-objects
    that uses 'git-rev-list --objects' output.  Prevent this.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored

Oct 02, 2005

  1. GIT 0.99.8

    GIT already did everything I wanted it to do since mid 0.99.7,
    and it has almost everything I want it to have now, except a
    couple of minor tweaks and enhancements.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  2. ebiederm

    [PATCH] Update git-clone documentation

    The documentation for git-clone is behind the actual command.
    I have been getting tired of reading the shell script to see
    what the arguments are so here is an update of the actual documentation.
    
    Signed-off-by: Eric Biederman <ebiederman@xmission.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ebiederm authored Junio C Hamano committed
  3. Handle really trivial case inside git-merge.

    Using Linus' --trivial option, this handles really trivial case
    inside git-merge itself, without using any strategy modules.
    
    A 'really trivial case' is:
    
     - we are merging one branch into the current branch;
     - there is only one merge base between the branches;
     - there is no file-level merge required.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  4. read-tree: --trivial

    This adds an option --trivial to restrict 3-way 'read-tree -m -u'
    to happen only if there is no file-level merging required.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds authored Junio C Hamano committed
  5. [PATCH] Teach git-ls-files about '--' to denote end of options.

    Useful if you have a file whose name starts with a dash.
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Fredrik Kuivinen authored Junio C Hamano committed
  6. [PATCH] Teach the recursive merge strategy about renames.

    It will now merge cases where a file was renamed in one branch and
    modified in the other branch cleanly. We also detect a couple of
    conflict cases now that wasn't detected before.
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Fredrik Kuivinen authored Junio C Hamano committed
  7. read-tree: remove --head option.

    Initially it was to allow specifying more than one remote to
    allow creation of an Octopus, but it is not being used.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  8. Customize git command for installations that lack certain commands.

    When the platform lacks certain git subcommands, omit them from the
    list of subcommands that are available from "git" wrapper.
    
    Noticed by Geert Bosch.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  9. hanb

    [PATCH] git on OpenBSD

    iconv is installed in /usr/local.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    hanb authored Junio C Hamano committed
  10. [PATCH] Re-instate index file write optimization

    This makes "git-update-index" avoid the new index file write if it didn't
    make any changes to the index.
    
    It still doesn't make things like "git status" be read-only operations in
    general, but if the index file doesn't need refreshing, it now will at
    least avoid making unnecessary changes.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds authored Junio C Hamano committed
  11. [PATCH] Better error reporting for "git status"

    Instead of "git status" ignoring (and hiding) potential errors from the
    "git-update-index" call, make it exit if it fails, and show the error.
    
    In order to do this, use the "-q" flag (to ignore not-up-to-date files)
    and add a new "--unmerged" flag that allows unmerged entries in the index
    without any errors.
    
    This also avoids marking the index "changed" if an entry isn't actually
    modified, and makes sure that we exit with an understandable error message
    if the index is corrupt or unreadable. "read_cache()" no longer returns an
    error for the caller to check.
    
    Finally, make die() and usage() exit with recognizable error codes, if we
    ever want to check the failure reason in scripts.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds authored Junio C Hamano committed
  12. More portability.

     - The location of openssl development files got customizable.
     - The location of iconv development files got customizable.
     - Pass $TAR down to t5000 test so that the user can override with
       'gmake TAR=gtar'.
     - Solaris 'bc' does not seem to grok "define abs()".  There is no
       reason to use bc there -- expr would do.
    
    Signed-off-by: Junio C Hamano <junio@twinsun.com>
    Junio C Hamano authored Junio C Hamano committed
  13. Add git-symbolic-ref

    This adds the counterpart of git-update-ref that lets you read
    and create "symbolic refs".  By default it uses a symbolic link
    to represent ".git/HEAD -> refs/heads/master", but it can be compiled
    to use the textfile symbolic ref.
    
    The places that did 'readlink .git/HEAD' and 'ln -s refs/heads/blah
    .git/HEAD' have been converted to use new git-symbolic-ref command, so
    that they can deal with either implementation.
    
    Signed-off-by: Junio C Hamano <junio@twinsun.com>
    Junio C Hamano authored Junio C Hamano committed
  14. Use resolve_ref() to implement read_ref().

    Symbolic refs are understood by resolve_ref(), so existing read_ref()
    users will automatically understand them as well.
    
    Signed-off-by: Junio C Hamano <junio@twinsun.com>
    Junio C Hamano authored Junio C Hamano committed
  15. [PATCH] Allow reading "symbolic refs" that point to other refs

    This extends the ref reading to understand a "symbolic ref": a ref file
    that starts with "ref: " and points to another ref file, and thus
    introduces the notion of ref aliases.
    
    This is in preparation of allowing HEAD to eventually not be a symlink,
    but one of these symbolic refs instead.
    
    [jc: Linus originally required the prefix to be "ref: " five bytes
     and nothing else, but I changed it to allow and strip any number of
     leading whitespaces to match what update-ref.c does.]
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds authored Junio C Hamano committed
  16. Teach update-ref about a symbolic ref stored in a textfile.

    A symbolic ref is a regular file whose contents is "ref:", followed by
    optional leading whitespaces, followed by a GIT_DIR relative pathname,
    followed by optional trailing whitespaces (the optional whitespaces
    are unconditionally removed, so you cannot have leading nor trailing
    whitespaces).  This can be used in place of a traditional symbolic
    link .git/HEAD that usually points at "refs/heads/master".  You can
    instead have a regular file .git/HEAD whose contents is
    "ref: refs/heads/master".
    
    [jc: currently the code does not enforce the symbolic ref to begin with
     refs/, unlike the symbolic link case.  It may be worthwhile to require
     either case to begin with refs/ and not have any /./ nor /../ in them.]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  17. [PATCH] git fetch --tags

    You can do
    
    	git fetch --tags <linus-kernel-repo>
    
    and it should fetch all my tags automatically.
    
    [jc: The original by Linus fetched and overwrote branch heads with
     --all, which felt dangerous and wrong, so I removed it.  Also this
     version does not use any refs that resulted as --tags for later
     merge. ]
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds authored Junio C Hamano committed
  18. [PATCH] HTTP partial transfer support fix.

    Don't unlink the temp file when an object transfer fails, so next attempt
    will pick up where the failed transfer left off
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Nick Hengeveld authored Junio C Hamano committed
  19. Update partial HTTP transfers.

    Add the sanity checks discussed on the list with Nick Hengeveld in
    <20050927000931.GA15615@reactrix.com>.
    
     * unlink of previous and rename from temp to previous can fail for
       reasons other than benign ones (missing previous and missing temp).
       Report these failures when we encounter them, to make diagnosing
       problems easier.
    
     * when rewinding the partially written result, make sure to
       truncate the file.
    
    Also verify the pack after downloading by calling
    verify_packfile().
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  20. [PATCH] HTTP partial transfer support for object, pack, and index tra…

    …nsfers
    
    HTTP partial transfer support for object, pack, and index transfers
    
    [jc: this should not be placed in "master" -- it does not have any
     fixes requested on the list.]
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Nick Hengeveld authored Junio C Hamano committed
  21. Pass CVSps generated A U Thor <author@domain.xz> intact.

    Alexey Nezhdanov updated CVSps to generate author-name and
    author-email information in its output.
    
    If the input looks like it has that already properly formatted,
    use that without our own munging.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  22. [PATCH] archimport: Actually cope with merges from "remote" repositor…

    …ies. Plus: Nicer messages.
    
    archimport was refusing to import commits that had merges from repositories
    that it didn't know about. Fixed.
    
    Also brings in nicer messages.
    
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Martin Langhoff authored Junio C Hamano committed
  23. Honor extractor's umask in git-tar-tree.

    The archive generated with git-tar-tree had 0755 and 0644 mode bits.
    This inconvenienced the extractor with umask 002 by robbing g+w bit
    unconditionally.  Just write it out with loose permissions bits and
    let the umask of the extractor do its job.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored

Oct 01, 2005

  1. Honor user's umask.

    Fix the last two holdouts that forced mode bits stricter than the user's umask.
    Noticed by Wolfgang Denk and fixed by Linus.
    
    [jc: applied the same fix to mailsplit just for the sake of consistency.]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  2. [PATCH] Flag empty patches as errors

    A patch that contains no actual diff, and that doesn't change any
    meta-data is bad. It shouldn't be a patch at all, and git-apply shouldn't
    just accept it.
    
    This caused a corrupted patch to be silently applied as an empty change in
    the kernel, because the corruption ended up making the patch look empty.
    
    An example of such a patch is one that contains the patch header, but
    where the initial fragment header (the "@@ -nr,.." line) is missing,
    causing us to not parse any fragments.
    
    The real "patch" program will also flag such patches as bad, with the
    message
    
    	patch: **** Only garbage was found in the patch input.
    
    and we should do likewise.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds authored Junio C Hamano committed
  3. Consolidate null_sha1[].

    Signed-off-by: Junio C Hamano <junio@twinsun.com>
    Junio C Hamano authored Junio C Hamano committed

Sep 30, 2005

  1. Still installing the old command names.

    After seeing Jeff's guide, I changed my mind about the
    big-rename transition plan.  Even if Porcelains are kept up to
    date, those web documents that describes older world order would
    live longer and people will stumble across them via google
    searches.  And who knows how many mirrored copies there are.
    
    The backward compatible symbolic links *will* be removed before
    1.0.  But that will not happen in 0.99.8.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  2. Tell which packfile is corrupt when we die.

    The core part detected and died upon seeing a corrupted packfile, but
    did not help the user by telling which packfile is corrupt and how.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano authored
  3. Pavel Roskin

    [PATCH] Make logerror() and loginfo() static

    Make logerror() and loginfo() static
    
    logerror() and loginfo() in daemon.c are never declared and never called
    from other files, therefore they should be declared static.  Found by
    sparse.
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    proski authored Junio C Hamano committed
Something went wrong with that request. Please try again.