Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Nov 12, 2005
  1. GIT 0.99.9h

    Junio C Hamano authored
    This is GIT 1.0-rc1 in disguise.  It is plausible that
    relatively new parts of the system still need tweaking and
    fixing, but that is why it is not 1.0 but rc ;-).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Ignore built git-lost+found.

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Documentation: asciidoc sources are utf-8

    Junio C Hamano authored
    git-pack-redundant documentation was encoded in latin1, which caused
    asciidoc to barf, which expected to see utf-8.  Run tcs to re-encode
    it in utf-8.
    
    Also just for fun try my name in Japanese in git-lost+found
    documentation ;-)
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Rename .git/lost+found to .git/lost-found.

    Junio C Hamano authored
    Just to avoid confusion that scripts poorly written by somebody
    else ;-) might mistake this as a mount point, or backup tools
    ignoring the directory.  The latter is probably not a big loss,
    however, considering that this directory's contents are to be
    used while fresh anyway.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. git-lost+found

    Junio C Hamano authored
    This command helps you resurrect accidentally lost tags and commits.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. git-prune: prune redundant packs

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. Make git-pack-redundant consider alt-odbs

    Lukas_Sandström authored Junio C Hamano committed
    This patch changes git-pack-redundant so that packfiles
    in alternate object directories also are considered when
    deciding which objects are redundant.
    
    This functionality is controlled by the flag '--alt-odb'.
    
    Also convert the other flags to the long form, and update
    docs and git-repack accordingly.
    
    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Rename git-pack-intersect to git-pack-redundant

    Lukas_Sandström authored Junio C Hamano committed
    This patch renames git-pack-intersect to git-pack-redundant
    as suggested by Petr Baudis. The new name reflects what the
    program does, rather than how it does it.
    
    Also fix a small argument parsing bug.
    
    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. Make git-repack use git-pack-intersect.

    Lukas_Sandström authored Junio C Hamano committed
    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Add git-pack-intersect to .gitignore

    Lukas_Sandström authored Junio C Hamano committed
    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Add documentation for git-pack-intersect

    Lukas_Sandström authored Junio C Hamano committed
    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. Add git-pack-intersect

    Lukas_Sandström authored Junio C Hamano committed
    This patch adds the program git-pack-intersect. It is
    used to find redundant packs in git repositories.
    
    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. merge-one-file: use empty- or common-base condintionally in two-stage…

    Junio C Hamano authored
    … merge.
    
    If two sides added the same path completely different thing, it is
    easier to see the merge pivoting on /dev/null.  So check the size of
    the common section we have found, and empty it if it is too small.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. Documentation: git-apply --no-add

    Junio C Hamano authored
    This is a specialized hack to help no-base merges, but other
    people might find it useful, so let's document it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  15. merge-one-file: use common as base, instead of emptiness.

    Junio C Hamano authored
    Unlike the previous round that merged the path added differently
    in each branches using emptiness as the base, compute a common
    version and use it as input to 'merge' program.
    
    This would show the resulting (still conflicting) file left in
    the working tree as:
    
    	common file contents...
    	<<<<<< FILENAME
    	version from our branch...
    	======
    	version from their branch...
    	>>>>>> .merge_file_XXXXXX
    	more common file contents...
    
    when both sides added similar contents.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  16. merge with /dev/null as base, instead of punting O==empty case

    Junio C Hamano authored
    Instead of leaving the path unmerged in a case where each side
    adds different version of the same path, attempt to merge it
    with empty base and leave "our" version in the index file, just
    like we do for the case in conflicting merge.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  17. Show URL in the "Getting <foo> list" http-fetch messages

    Petr Baudis authored Junio C Hamano committed
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  18. merge-recursive: Use '~' instead of '_' to separate file names from b…

    Fredrik Kuivinen authored Junio C Hamano committed
    …ranch names
    
    Makes it less probable that we get a clash with an existing file,
    furthermore Cogito already uses '~' for this purpose.
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  19. merge-recursive: Add copyright notice

    Fredrik Kuivinen authored Junio C Hamano committed
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  20. merge-recursive: Indent the output properly

    Fredrik Kuivinen authored Junio C Hamano committed
    If we have multiple common ancestors and have to recursively merge
    them then the output will be much more readable with this commit.
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 11, 2005
  1. Change 'cache' to 'index' in the docs

    Lukas_Sandström authored Junio C Hamano committed
    This patch makes the documentation refer to the index
    as index instead of cache, but some references still
    remain. (e.g. git-update-index.txt)
    
    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. INSTALL: duplicate python requirements from Makefile

    Junio C Hamano authored
    ... and refer the reader to Makefile for other things that can be
    tweaked.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Merge branches 'jc/sb' and 'jc/mb'

    Junio C Hamano authored
  4. t1200: use --topo-order to keep the show-branch output stable.

    Junio C Hamano authored
    Because a batch-oriented script creates many commits within a second
    on a fast machine, show-branch output of the test results are unstable
    without topo-order.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Fully detect uninteresting commits.

    Junio C Hamano authored
    With the change in the previous round, we are guaranteed to come up
    with the list of all relevant merge bases, but sometimes we do not
    fully mark unintersting ones due to a horizon effect.  Add a phase to
    postprocess, so that we mark all ancestor of "interesting" commit.
    
    This also changes the default ordering of shown commits back to
    chronological order, and adds --topo-order flag to show them in
    topological order.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. git-show-branch: tighten merge-base computation.

    Junio C Hamano authored
    This makes the merge-base computation resistant to the pathological
    case discussed on the list earlier, by doing the same logic as
    git-merge-base.  As a side effect, it breaks the command's primary
    function to list non-merge commit sequences, which needs to be fixed
    separately.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. Add test case for merge-base.

    Junio C Hamano authored
    Although it was shown that the "full contamination" was not really full
    during the list discussion, the series improves things without incurring
    extra parsing cost, and here is a test to check that.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. merge-base: avoid unnecessary postprocessing.

    Junio C Hamano authored
    When we have only one merge-base candidates in the result list,
    there is no point going back to mark the reachable commits
    again.  And that is the most common case, so try not to waste
    time on it.  Suggested by Linus.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. merge-base: fully contaminate the well.

    Junio C Hamano authored
    The discussion on the list demonstrated a pathological case where
    an ancestor of a merge-base can be left interesting.  This commit
    introduces a postprocessing phase to fix it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. RPM: arch submodule needs tla.

    Junio C Hamano authored
    Noticed by Horst von Brand.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. git-clone: Allow cloning into directories other than child of current…

    Andreas Ericsson authored Junio C Hamano committed
    … dir.
    
    This patch adds -p to mkdir and an explicit check to see if the target
    directory exists (since mkdir -p doesn't throw an error if it does).
    
    Signed-off-by: Andreas Ericsson <ae@op5.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. git-clone: Keep remote names when cloning unless explicitly told not to.

    Andreas Ericsson authored Junio C Hamano committed
    With this patch the following commands all clone into the local directory
    "repo". If repo exists, it will still barf.
    
    	git-clone git://host.xz/repo.git
    	git-clone /path/to/repo/.git
    	git-clone host.xz:repo.git
    
    I ended up doing the same source-to-target sed'ing for all our company
    projects, so it was easier to add it directly to git-clone.
    
    Signed-off-by: Andreas Ericsson <ae@op5.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. specfile cleanups

    Chris Wright authored Junio C Hamano committed
    Some specfile cleanups after the split.
    - zlib dependency fix, current method is inconsistent, you can
      potentially build a package that you can't install on machine you
      built it on
    - Add proper defattr
    - Remove trailing '.' in summary
    - Add docs to split up packages
    - Add git-core dependency for each subpackage
    - Move arch import to separate package as well
    
    Signed-off-by: Chris Wright <chrisw@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. archimport: handle pika escaping

    Martin Langhoff authored Junio C Hamano committed
    Arch uses pika escaping in some places (but not all!). Specifically, commits of
    the type 'patch' use pika escaping in the log entries, which we parse to know
    what to add/delete and what to commit.
    
    This patch checks for hints of pika escaping and asks tla to unescape for us.
    
    Originally implemented by Penny Leach <penny@catalyst.net.nz>
    
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  15. @proski

    git-clone: quote destination directory name

    proski authored Junio C Hamano committed
    git-clone doesn't quote the full path to the destination directory,
    which causes it to fail if the path contains spaces or other characters
    interpreted by the shell.
    
    [jc: obviously I was not careful enough.  Pavel, thanks for catching.]
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Something went wrong with that request. Please try again.