Permalink
Commits on Dec 15, 2005
  1. GIT 0.99.9n aka 1.0rc6

    Oh, I hate to do this but I ended up merging big usage string
    cleanups from Fredrik, git-am enhancements that made a lot of
    sense for non mbox users from HPA, and rebase changes (done
    independently by me and Lukas) among other things, so git is
    still in perpetual state of 1.0rc.  1.0 will probably be next
    Wednesday, but who knows.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 15, 2005
  2. git rebase loses author name/email if given bad email address

    If GIT_AUTHOR_EMAIL is of a certain form, `git rebase master' will blow
    away the author name and email when fast-forward merging commits.  I
    have not tracked it down, but here is a testcase that demonstrates the
    behavior.
    
    Signed-off-by: Amos Waterland <apw@us.ibm.com>
    Acked-by: Michal Ostrowski <mostrows@watson.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Amos Waterland committed with Junio C Hamano Dec 14, 2005
  3. Bugfixes for git-rebase

    Fix bugs in git-rebase wrt rebasing another branch than
    the current HEAD, rebasing with a dirty working dir,
    and rebasing a proper decendant of the target branch.
    
    [jc: with a bit of hand-merging]
    
    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Lukas Sandström committed with Junio C Hamano Dec 14, 2005
  4. mailinfo and git-am: allow "John Doe <johndoe>"

    An isolated developer could have a local-only e-mail, which will
    be stripped out by mailinfo because it lacks '@'.  Define a
    fallback parser to accomodate that.
    
    At the same time, reject authorless patch in git-am.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 15, 2005
Commits on Dec 14, 2005
  1. define MAXPATHLEN for hosts that don't support it

    [jc: Martin says syllable (www.syllable.org) wants this.]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Martin Atukunda committed with Junio C Hamano Dec 13, 2005
  2. Do not let errors pass by unnoticed when running `make check'.

    [jc: originally from Amos Waterland.]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 14, 2005
  3. Merge branch 'hold/am'

    Junio C Hamano committed Dec 14, 2005
  4. rebase: do not get confused in fast-forward situation.

    When switching to another branch and rebasing it in a one-go, it
    failed to update the variable that holds the branch head, and
    did not detect fast-forward situation correctly.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 14, 2005
  5. Merge branch 'fk/usage'

    Junio C Hamano committed Dec 14, 2005
  6. Documentation: topic branches

    Recommend git over ssh direct to master.kernel.org, instead of
    going over rsync to public machines, since this is meant to be a
    procedure for kernel subsystem maintainers.
    
    Also fix an obvious typo.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 14, 2005
  7. applypatch: no need to do non-portable [[ ... ]]

    ... when old, proven, case would do.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 14, 2005
  8. git-repack: Usage string clean-up, emit usage at incorrect invocation

    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    freku045@student.liu.se committed with Junio C Hamano Dec 13, 2005
  9. git-rebase: Usage string clean-up, emit usage string at incorrect inv…

    …ocation
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    freku045@student.liu.se committed with Junio C Hamano Dec 13, 2005
  10. git-prune: Usage string clean-up, use the 'usage' function

    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    freku045@student.liu.se committed with Junio C Hamano Dec 13, 2005
  11. git-lost-found: Usage string clean-up, emit usage string at incorrect…

    … invocation
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    freku045@student.liu.se committed with Junio C Hamano Dec 13, 2005
  12. git-fetch: Usage string clean-up, emit usage string at unrecognized o…

    …ption
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    freku045@student.liu.se committed with Junio C Hamano Dec 13, 2005
  13. git-cherry: Usage string clean-up, use the 'usage' function

    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    freku045@student.liu.se committed with Junio C Hamano Dec 13, 2005
  14. git-applypatch: Usage string clean-up, emit usage string at incorrect…

    … invocation
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    freku045@student.liu.se committed with Junio C Hamano Dec 13, 2005
  15. git-am: Usage string clean-up

    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    freku045@student.liu.se committed with Junio C Hamano Dec 13, 2005
  16. git-revert: Usage string clean-up

    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    freku045@student.liu.se committed with Junio C Hamano Dec 13, 2005
  17. git-verify-tag: Usage string clean-up, emit usage string at incorrect…

    … invocation
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    freku045@student.liu.se committed with Junio C Hamano Dec 13, 2005
  18. Trivial usage string clean-up

    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    freku045@student.liu.se committed with Junio C Hamano Dec 13, 2005
  19. t3200: branch --help does not die anymore.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 13, 2005
  20. Usage message clean-up, take #2

    There were some problems with the usage message clean-up patch
    series. I hadn't realised that subdirectory aware scripts can't source
    git-sh-setup. I propose that we change this and let the scripts which
    are subdirectory aware set a variable, SUBDIRECTORY_OK, before they
    source git-sh-setup.
    
    The scripts will also set USAGE and possibly LONG_USAGE before they
    source git-sh-setup. If LONG_USAGE isn't set it defaults to USAGE.
    
    If we go this way it's easy to catch --help in git-sh-setup, print the
    (long) usage message to stdout and exit cleanly. git-sh-setup can
    define a 'usage' shell function which can be called by the scripts to
    print the short usage string to stderr and exit non-cleanly. It will
    also be easy to change $0 to basename $0 or something else, if would
    like to do that sometime in the future.
    
    What follows is a patch to convert a couple of the commands to this
    style. If it's ok with everyone to do it this way I will convert the
    rest of the scripts too.
    
    [jc: thrown in to proposed updates queue for comments.]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Fredrik Kuivinen committed with Junio C Hamano Dec 11, 2005
  21. git-am support for naked email messages (take 2)

    This allows git-am to accept single-message files as well as mboxes.
    Unlike the previous version, this one doesn't need to be explicitly told
    which one it is; rather, it looks to see if the first line is a From
    line and uses it to select mbox mode or not.
    
    I moved the logic to do all this into git-mailsplit, which got a new
    user interface as result, although the old interface is still available
    for backwards compatibility.
    
    [jc: applied with two obvious fixes.]
    
    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 Dec 14, 2005
  22. Everyday: a bit more examples.

    Talk about the following as well:
    
     * git fetch --tags
     * Use of "git push" as a one-man distributed development vehicle.
     * Show example of remotes file for pulling and pushing.
     * Annotate git-shell setup.
     * Using Carl's update hook in a CVS-style shared repository.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 14, 2005
  23. checkout-index: fix checking out specific path.

    3bd348a commit broke checking
    out specific paths.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 14, 2005
  24. Make git-send-pack exit with error when some refs couldn't be pushed out

    In case some refs couldn't be pushed out due to an error (mostly the
    not-a-proper-subset error), make git-send-pack exit with non-zero status
    after the push is over (that is, it still tries to push out the rest
    of the refs).
    
    [jc: I adjusted a test for this change.]
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Dec 14, 2005
  25. [PATCH] allow merging any committish

    Although "git-merge" is advertised as the end-user level command
    (instead of being a "git-pull" backend), it was not prepared to
    take tag objects that point at commits and barfed when fed one.
    Sanitize the input while we validate them, for which we already
    have a loop.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 14, 2005
Commits on Dec 13, 2005
  1. git-clone: tell the user a bit more about clone-pack failure.

    When clone-pack has trouble with the remote, it dies unfriendly
    "EOF" error message.  We cannot tell the reason why it failed
    from the local end; it could be that the repository did not
    exist, or configured not to serve over git-daemon, or a network
    failure.  At least, saying clone-pack failed makes it a bit more
    meaningful.
    
    I am not convinced yet that removing the newly created directory
    is the right thing to do, so this commit leaves the new
    directory behind.
    
    Reported by Sam Ravnborg.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 13, 2005
  2. Documentation: not learning core git commands.

    The initial section of tutorial was too heavy on internal
    workings for the first-time readers, so rewrite the introductory
    section of git(7) to start with "not learning core git commands"
    section and refer them to README to grasp the basic concepts,
    then Everyday to give overview with task/role oriented examples
    for minimum set of commands, and finally the tutorial.
    
    Also add to existing note in the tutorial that many too
    technical descriptions can be skipped by a casual reader.
    
    I initially started to review the tutorial, with the objective
    of ripping out the detailed technical information altogether,
    but I found that the level of details in the initial couple of
    sections that talk about refs and the object database in a
    hands-on fashion was about rigth, and left all of them there.  I
    feel that reading about fsck-index and repack is too abstract
    without being aware of these directories and files.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 13, 2005
  3. Documentation: diff examples.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 13, 2005
  4. Documentation: fix missing links to git(7)

    Also move pack protocol description to technical/.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 13, 2005
  5. Documentation: more examples.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 13, 2005
  6. Everyday: a bit more example.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Dec 13, 2005