Permalink
Commits on Jan 31, 2007
  1. GIT v1.5.0-rc3

    Junio C Hamano committed Jan 31, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Do not use hardcoded path to xhmtl.xsl to generate user's manual

    Junio C Hamano committed Jan 31, 2007
    It does not seem to need it either and gives an error on FC5 I use
    at kernel.org to cut documentation tarballs, so remove it in the
    meantime.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git main documentation: point at the user's manual.

    Junio C Hamano committed Jan 31, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Merge branch 'master' of git://linux-nfs.org/~bfields/git

    Junio C Hamano committed Jan 31, 2007
    This is in the hope of giving JBF's user-manual wider exposure.
    I am not very happy with trailing whitespaces in the new
    document, but let's not worry too much about the formatting
    issues for now, but concentrate more on the structure and the
    contents.
  5. t9200: do not test -x bit if the filesystem does not support it.

    Junio C Hamano committed Jan 31, 2007
    The last test in t9200 wants to see if executable bit is
    retained, which has no chance of succeeding on a filesystem that
    does not handle executable bit correctly.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. t9200: Re-code non-ascii path test in UTF-8

    Junio C Hamano committed Jan 31, 2007
    For the purpose of this test we do not really care if the paths
    are in latin-1, but people on Cygwin seem to be having problem
    on foreign-looking pathnames that do not play well with their
    locale.
    
    Let's try to re-code them in UTF-8 and see who screams,
    thanks, or reports no-improvements.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. Update git-cat-file documentation

    kvaneesh committed with Junio C Hamano Jan 30, 2007
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Documentation: "git-checkout <tree> <path>" takes any tree-ish

    Junio C Hamano committed Jan 31, 2007
    Especially, it is not limited to branch.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. Improved error message from git-rebase

    dkagedal committed with Junio C Hamano Jan 31, 2007
    If the index wasn't clean, git-rebase would simply show the output from
    git-diff-index with no further comment to the user.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Fix git-update-index to work with relative pathnames.

    raalkml committed with Junio C Hamano Jan 31, 2007
    In particular, it fixes the following (typical for cygwin) problem:
    
        $ git-update-index --chmod=-x ../wrapper/Jamfile
        fatal: git-update-index: cannot chmod -x '../wrapper/Jamfile'
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Escape --upload-pack from expr.

    spearce committed with Junio C Hamano Jan 30, 2007
    Recent commit ae1dffc by Junio
    changed the way --upload-pack was passed around between clone,
    fetch and ls-remote and modified the handling of the command
    line parameter parsing.
    
    Unfortunately FreeBSD 6.1 insists that the expression
    
      expr --upload-pack=git-upload-pack : '-[^=]*=\(.*\)'
    
    is illegal, as the --upload-pack option is not supported by their
    implementation of expr.
    
    Elsewhere in Git we use z as a leading prefix of both arguments,
    ensuring the -- isn't seen by expr.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. Don't coredump on bad refs in update-server-info.

    spearce committed with Junio C Hamano Jan 31, 2007
    Apparently if we are unable to parse an object update-server-info
    coredumps, as it doesn't bother to check the return value of its
    call to parse_object.
    
    Instead of coredumping, skip the ref.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. tone down the detached head warning

    Nicolas Pitre committed with Junio C Hamano Jan 31, 2007
    This is not meant to frighten people or even to suggest they might be
    doing something wrong, but rather to notify them of a state change and
    provide a likely option in the case this state was entered by mistake.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. Fix git-tag -u

    Junio C Hamano committed Jan 31, 2007
    ... which I broke when we introduced user.signingkey configuration.
    There was no reason to add a new variable keyid to the script.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jan 30, 2007
  1. user-manual: todo's

    J. Bruce Fields committed Jan 30, 2007
    Update todo's.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  2. user-manual: point to README for gitweb information

    J. Bruce Fields committed Jan 30, 2007
    I'd like complete gitweb setup instructions some day, but for now just
    refer to the gitweb README.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  3. blameview: Use git-cat-file to read the file content.

    kvaneesh committed with Junio C Hamano Jan 30, 2007
    Fix blameview to use git-cat-file to read the file content.
    This make sure we show the right content when we have modified
    file in the working directory which is not committed.
    
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-fetch: Allow fetching the remote HEAD

    Santi Béjar committed with Junio C Hamano Jan 30, 2007
    ... with:
    
    $ git fetch ${remote} HEAD
    
    Also
    
    $ git fetch ${remote} :${localref}
    
    worked, but
    
    $ git fetch ${remote} HEAD:{localref}
    
    didn't. Now both are equivalent.
    
    Signed-off-by: Santi Béjar <sbejar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. git-send-email: remove debugging output.

    Junio C Hamano committed Jan 30, 2007
    rfc2047 unquoter spitted out an annoying "- unquoted" which was
    added during debugging but I forgot to remove.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Add a missing fork() error check.

    Johannes Sixt committed with Junio C Hamano Jan 24, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. git-blame: somewhat better commenting.

    Junio C Hamano committed Jan 30, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jan 29, 2007
  1. Make fsck and fsck-objects be builtins.

    distorted-mdw committed with Junio C Hamano Jan 29, 2007
    The earlier change df391b1 to rename fsck-objects to fsck broke
    fsck-objects.  This should fix it again.
    
    Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-commit -s: no extra space when sign-offs appear at the end already.

    Junio C Hamano committed Jan 29, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Replace perl code with pure shell code

    corecode committed with Junio C Hamano Jan 29, 2007
    Signed-off-by: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. lock_any_ref_for_update(): do not accept malformatted refs.

    Junio C Hamano committed Jan 29, 2007
    We used to use lock_any_ref_for_update() because the command
    needs to also update HEAD (which is not under refs/, so
    lock_ref_sha1() cannot be used).  The function however did not
    check for refs with illegal characters in them.
    
    Use check_ref_format() to catch malformed refs.  For this check,
    we specifically do not want to say having less than two levels
    in the name is illegal to allow HEAD (and perhaps other special
    refs in the future).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Two small typofixes.

    Junio C Hamano committed with J. Bruce Fields Jan 29, 2007
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. user-manual: SHA1 -> object name

    J. Bruce Fields committed Jan 29, 2007
    Prefer "object name" to SHA1, at least in higher level documentation.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  7. user-manual: document git-show-branch example

    J. Bruce Fields committed Jan 29, 2007
    Document Junio's show-branch trick for finding out which tags are
    descendents of a given comit.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  8. user-manual: minor "TODO" updates

    J. Bruce Fields committed Jan 29, 2007
    I still really want a section on interoperability with CVS, subversion,
    etc., but I'm not getting around to it very fast, so just add this to
    the TODO section for now.  And a few other minor todo updates.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  9. user-manual: rewrap a few long lines

    J. Bruce Fields committed Jan 29, 2007
    Rewrap some long lines.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  10. user-manual: reflogs, other recovery

    J. Bruce Fields committed Jan 29, 2007
    Add a brief discussion of reflogs.  Also recovery of dangling commits
    seems to fit in here, so move some of the discussion out of Linus's
    email to here.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  11. user-manual: fix a header level

    J. Bruce Fields committed Jan 29, 2007
    Oops.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  12. user-manual: typo fix

    J. Bruce Fields committed Jan 29, 2007
    Oops
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  13. user-manual: add references to git-config man page

    J. Bruce Fields committed Jan 29, 2007
    Direct editing of config files may be more natural for users than using
    the git-config commandline; but we should still reference the
    git-config man page when we describe such editing, so people know where
    to go for details on the config file syntax and meanings of the
    variables.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
  14. user-manual: repo-config -> config

    J. Bruce Fields committed Jan 29, 2007
    Looks like we're going to allow git-config as the preferred alias to
    git-repo-config, so let's document that instead.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>