Permalink
Commits on Nov 7, 2005
  1. GIT 0.99.9e

    Junio C Hamano committed Nov 7, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. http-fetch: do not use curl_message after releasing it

    dscho committed with Junio C Hamano Nov 6, 2005
    When curl_message is released using curl_multi_remove_handle(), it's
    contents are undefined. Therefore, get the information before releasing it.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Allow GIT_DIR to be an absolute path

    dscho committed with Junio C Hamano Nov 6, 2005
    This fixes a problem in safe_create_leading_directories() when the
    argument starts with a '/' (i.e. the path is absolute).
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. http-push.c: include with angle bracket, not dq.

    Paul Collins committed with Junio C Hamano Nov 6, 2005
    Do not search the current directory when including expat.h, since it
    is not supplied by git.
    
    Signed-off-by: Paul Collins <paul@briny.ondioline.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Set up remotes/origin to track all remote branches.

    Junio C Hamano committed Nov 6, 2005
    This implements the idea Daniel Barkalow came up with, to match
    the remotes/origin created by clone by default to the workflow I
    use myself in my guinea pig repository, to have me eat my own
    dog food.
    
    We probably would want to use either .git/refs/local/heads/*
    (idea by Linus) or .git/refs/heads/origin/* instead to reduce
    the local ref namespace pollution.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. git-status: do not mark unmerged paths as committable.

    Junio C Hamano committed Nov 7, 2005
    An unmerged path appears as both "Updated but not checked in" list,
    and "Changed but not updated" list.  We are not going to commit that
    path until it is resolved, so remove it from the former list.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. ls-files: --others should not say unmerged paths are unknown.

    Junio C Hamano committed Nov 7, 2005
    Jon Loeliger noticed that an unmerged path appears as
    "Untracked" in git-status output, even though we show the same
    path as updated/changed.  Since --others means "we have not told
    git about that path", we should not show unmerged paths --
    obviously, git knows about them; it just does not know what we
    want to do about them yet.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 6, 2005
  1. Use fink/darwinport paths for OSX

    RandalSchwartz committed with Junio C Hamano Nov 6, 2005
    There's no standard libexpat for OSX, so if you install it
    after-market, it can end up in various directories.  Give
    paths used by fink and darwinports by default to CFLAGS.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Refactor merge strategies into separate includable file.

    Jon Loeliger committed with Junio C Hamano Nov 6, 2005
    Signed-off-by: Jon Loeliger <jdl@freescale.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Document expat dependency when using http-push.

    Junio C Hamano committed Nov 5, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Merge in http-push first stage.

    Junio C Hamano committed Nov 6, 2005
  5. Refresh the remote lock if it is about to expire

    Nick Hengeveld committed with Junio C Hamano Nov 4, 2005
    Refresh the remote lock if it is about to expire
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Improve lock handling

    Nick Hengeveld committed with Junio C Hamano Nov 4, 2005
    Improve lock handling: parse the server response for the timeout, owner,
    and lock token
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. Support remote references with slashes in their names

    Nick Hengeveld committed with Junio C Hamano Nov 4, 2005
    Support remote references with slashes in their names
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Verify remote packs, speed up pending request queue

    Nick Hengeveld committed with Junio C Hamano Nov 4, 2005
    Verify that remote packs exist before using the pack index, add requests to
    the beginning of the queue to locate pending requests faster.
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. Add support for pushing to a remote repository using HTTP/DAV

    Nick Hengeveld committed with Junio C Hamano Nov 2, 2005
    Add support for pushing to a remote repository using HTTP/DAV
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Debian: test build.

    Junio C Hamano committed Nov 5, 2005
    Update version number in changelog to match the 0.99.9.GIT version
    number, to allow building private deb from wip.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Further Debian split fixes.

    Junio C Hamano committed Nov 5, 2005
    The doc installation was flattened, breaking links to howto/.
    Silly cut&paste error made git-doc depend on tk8.4.  Doh.
    Move most of the documentation (except manuals) to git-doc.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. Install asciidoc sources as well.

    Junio C Hamano committed Nov 5, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. Package split: Debian.

    Junio C Hamano committed Nov 5, 2005
    As discussed on the list, split the foreign SCM interoperability
    packages and documentation from the git-core binary package.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. Simplify CFLAGS/DEFINES in Makefile

    Junio C Hamano committed Nov 5, 2005
    I think the original intention was to make CFLAGS overridable
    from the make command line, but somehow we ended up accumulating
    conditional makefile sections that wrongly appends values to
    CFLAGs.  These assignments do not work when the user actually
    override them from the make command line!
    
    DEFINES are handled the same way; it was seemingly overridable,
    but the makefile sections had assignments, which meant
    overriding it from the command line broke things.
    
    This simplifies things by limiting the internal futzing to
    ALL_CFLAGS, and by removing DEFINES altogether.  Overriding
    CFLAGS from the command line should start working with this
    change.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  15. git-fetch: fail if specified refspec does not match remote.

    Junio C Hamano committed Nov 6, 2005
    'git-fetch remote no-such-ref' succeeded without fetching any
    ref from the remote.  Detect such case and report an error.
    
    Note that this makes 'git-fetch remote master master' to fail,
    because the remote branch 'master' matches the first refspec,
    and the second refspec is left unmatched, which is detected by
    the error checking logic.  This is somewhat unintuitive, but
    giving the same refspec more than once to git-fetch is useless
    in any case so it should not be much of a problem.  I'd accept a
    patch to change this if somebody cares enough, though.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  16. Documentation: pull/clone ref mapping clarification.

    Junio C Hamano committed Nov 6, 2005
    Josef Weidendorfer points out that git-clone documentation does not
    mention the initial copying of remote branch heads into corresponding
    local branches.  Also clarify the purpose of the ref mappings description
    in the "remotes" file and recommended workflow.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  17. git-format-patch: silly typo fix.

    Junio C Hamano committed Nov 6, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 5, 2005
  1. test: t4102-apply-rename fails with strict umask.

    Junio C Hamano committed Nov 5, 2005
    We checked the result of patch application for full permission bits,
    when the only thing we cared about was to make sure the executable
    bit was correctly set.
    
    Noticed by Peter Baumann.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. GIT 0.99.9d

    Junio C Hamano committed Nov 5, 2005
    This is primarily to include the 'git clone -l' (without -s) fix,
    first spotted and diagnosed by Linus and caused James Bottomley's
    repository to become unreadable.  It also contains documentation
    updates happened on the "master" branch since 0.99.9c
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-clone: fix local clone

    Junio C Hamano committed Nov 5, 2005
    If we let cpio to create the leading directories implicitly,
    it ends up having funny perm bits (GNU cpio 2.5 and 2.6, at least).
    This leaves .git/object/?? directories readable only by the owner.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. init-db::copy_file() - use copy_fd()

    Junio C Hamano committed Nov 5, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. copy.c::copy_fd() - do not leak file descriptor on error return.

    Junio C Hamano committed Nov 5, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Documentation: format-patch

    Junio C Hamano committed Nov 5, 2005
    Add examples section and talk about using this to cherry-pick
    commits.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. format-patch: "rev1.." should mean "rev1..HEAD"

    Junio C Hamano committed Nov 5, 2005
    "rev1.." should mean "rev1..HEAD"; git-diff users are familiar
    with that syntax.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Documentation: git-fetch/pull updates.

    Junio C Hamano committed Nov 5, 2005
    We do not accept multiple <refspecs> on one Pull:/Push: line
    right now (we could lift this tentative workaround for the
    broken refnames), but we have always accepted multiple such
    lines, so use that form in the examples and discussion.
    
    Also explicitly mention that Octopus is made only with an
    explicit command line request and never from Pull: lines.
    
    Add a couple of cross references.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. Added a few examples to git-pull man page.

    Jon Loeliger committed with Junio C Hamano Nov 5, 2005
    Clarified and added notes for pull/push refspecs.
    Converted to back-ticks for literal text examples.
    
    [jc: Also fixed git-pull description that still talked about its
    calling git-resolve or git-octopus (we do not anymore; instead
    we just call git-merge).  BTW, I am reasonably impressed by how
    well "git-am -3" applied this patch, which had some conflicts
    because I've updated the documentation somewhat.]
    
    Signed-off-by: Jon Loeliger <jdl@freescale.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Document the --no-commit flag better

    Junio C Hamano committed Nov 5, 2005
    Pasky and I did overlapping documentation independently; this is to
    pick up better wordings from what he sent me.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 4, 2005
  1. Documentation: -merge and -pull: describe merge strategies.

    Junio C Hamano committed Nov 4, 2005
    ... and give a couple of examples of running 'git pull' against
    local repository.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>