Permalink
Commits on Nov 10, 2005
  1. GIT 0.99.9g

    Junio C Hamano committed Nov 10, 2005
    Another snapshot, as slow and steady marth towards 1.0 continues.
    Major changes include:
    
     - Jim Radford's RPM split.
     - Fredrik's recursive merge strategy is now default for two heads merge.
     - Yaacov's SVN importer updates.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Make git-recursive the default strategy for git-pull.

    Junio C Hamano committed Nov 8, 2005
    This does two things:
    
     - It changes the hardcoded default merge strategy for two-head
       git-pull from resolve to recursive.
    
     - .git/config file acquires two configuration items.
       pull.twohead names the strategy for two-head case, and
       pull.octopus names the strategy for octopus merge.
    
    IOW you are paranoid, you can have the following lines in your
    .git/config file and keep using git-merge-resolve when pulling
    one remote:
    
    	[pull]
    		twohead = resolve
    
    OTOH, you can say this:
    
    	[pull]
    		twohead = resolve
    		twohead = recursive
    
    to try quicker resolve first, and when it fails, fall back to
    recursive.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Use 'merge-base --all' where applicable.

    Junio C Hamano committed Nov 10, 2005
    It may get extra merge base on truly pathological commit histories,
    but is a lot easier to understand, explain, and prove correctness.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Merge branch 'hold/svn'

    Junio C Hamano committed Nov 10, 2005
  5. Merge branch 'hold/rpm'

    Junio C Hamano committed Nov 10, 2005
Commits on Nov 9, 2005
  1. git-apply: do not fail on binary diff when not applying nor checking.

    Junio C Hamano committed Nov 9, 2005
    We run git-apply with --stat and --summary at the end of the pull
    by default, which causes it to barf when the pull brought in changes
    to binary files.  Just mark them as binary patch and proceed when
    not applying nor checking.
    
    [jc: I almost missed --check until I saw Linus did something similar.]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Update INSTALL

    Junio C Hamano committed Nov 9, 2005
    Explicitly mention how to install by hand in build-as-user and
    install-as-root steps.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. merge-recursive: Fix support for branch names containing slashes

    Fredrik Kuivinen committed with Junio C Hamano Nov 9, 2005
    A branch name could have a slash in it.
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. merge-recursive: Fix limited output of rename messages

    Fredrik Kuivinen committed with Junio C Hamano Nov 9, 2005
    The previous code did the right thing, but it did it by accident.
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Fix cvsexportcommit syntax error

    Alexander Litvinov committed with Junio C Hamano Nov 9, 2005
    There is a syntax error in cvsexport script:
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Update howto using-topic-branches

    Luck, Tony committed with Junio C Hamano Nov 8, 2005
    "git resolve" is being deprecated in favour of "git merge".
    Update the documentation to reflect this.
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. sparse fixes for http-{fetch,push}.c

    Peter Hagervall committed with Junio C Hamano Nov 8, 2005
    Make a bunch of needlessly global functions static, and replace two
    K&R-style declarations.
    
    Signed-off-by: Peter Hagervall <hager@cs.umu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 8, 2005
  1. git-tag -d <tag>: delete tag <tag>

    Kai Ruemmler committed with Junio C Hamano Nov 8, 2005
    This adds option '-d' to git-tag.sh and documents it.
    
    Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. make tests ignorable with "make -i"

    raalkml committed with Junio C Hamano Nov 8, 2005
    Allow failed tests to be ignored using make's "-i". The patch also
    disables parallel make in t/. This doesn't make the testing any
    different as before: the tests were run sequentially before.
    
    It also allows to run more tests, ignoring the ones usually failing
    just to figure out if something else broke.  (Or to ignore plainly
    uninteresting situations because of the testing being done on say...
    cygwin ;)
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. fix t5000-tar-tree.sh when $TAR isn't set

    raalkml committed with Junio C Hamano Nov 8, 2005
    $TAR isn't set everywhere. Provide a default (tar)
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Clean build annoyance.

    Junio C Hamano committed Nov 8, 2005
    As Pasky pointed out, building in templates directory showed
    list of built template files which was unneeded.  This commit
    also fixes another build annoyance I recently left in by
    accident.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. GIT 0.99.9f

    Junio C Hamano committed Nov 8, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Separate RPMS for programs with non-standard dependencies.

    radford committed with Junio C Hamano Nov 5, 2005
    Signed-off-by: Jim Radford <radford@blackbean.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. Fix a couple of obvious and insignificant typo.

    Junio C Hamano committed Nov 5, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Lift the default limit of number of revs.

    yaslama committed with Junio C Hamano Nov 2, 2005
    Now that the leak is gone, there is by default no limit of revisions to
    import.  No more message about leak when the limit (given by the -l
    parameter) is reached.
    
    Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. Handle a revision that only creates a new tag correctly.

    yaslama committed with Junio C Hamano Nov 2, 2005
    Fix an error when a svn revision consists only of the creation of a new tag
    directory (/tags/this_is_a_tag).
    
    Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Bundle file copies from multiple branches into a merge.

    yaslama committed with Junio C Hamano Nov 2, 2005
    When copying files and/or directories from several branches in one single
    revision, all these branches are used as parents of the commit.
    
    Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. copy_dir becomes copy_path and handles both files and directories

    yaslama committed with Junio C Hamano Nov 2, 2005
    The A (Add) and R (Replace) actions handling are unified.
    
    Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. Don't output error on changes in the nodes /, /tags or /branches

    yaslama committed with Junio C Hamano Nov 2, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. Add node_kind function to differentiate between file and directory

    yaslama committed with Junio C Hamano Nov 2, 2005
    Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. Use svn pools to solve the memory leak problem.

    yaslama committed with Junio C Hamano Nov 2, 2005
    Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  15. git-am: do not lose already edited final-commit when resuming.

    Junio C Hamano committed Nov 8, 2005
    The last round stopped munging the patch when resuming, but
    failed to preserve final-commit.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  16. ls-files and read-tree need core.filemode

    raalkml committed with Junio C Hamano Nov 8, 2005
    ls-files.c and read-tree.c miss the default configuration, in
    particular the filemode=false part.  The recent +x bit flip made me
    notice that, because git-merge refused to merge anything saying that
    git-pull.sh is not up to date.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  17. Debian: packaging updates.

    Junio C Hamano committed Nov 8, 2005
    Do not scatter txt and html documentation into feature subpackages.
    Do place man pages into them.
    
    Capture more cvs stuff into git-cvs package.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  18. Use consistent shell prompts and example style.

    Jon Loeliger committed with Junio C Hamano Nov 7, 2005
    Signed-off-by: Jon Loeliger <jdl@freescale.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  19. Add --tags documentation, scraped from JC mail.

    Jon Loeliger committed with Junio C Hamano Nov 7, 2005
    Signed-off-by: Jon Loeliger <jdl@freescale.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  20. Add support for git-http-push to git-push script

    Nick Hengeveld committed with Junio C Hamano Nov 2, 2005
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  21. Tutorial: do not use 'git resolve'.

    Junio C Hamano committed Nov 8, 2005
    Use 'git merge' instead.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  22. Documentation: fix dependency generation.

    Junio C Hamano committed Nov 8, 2005
    The previous rule misses the case where git.txt or tutorial.txt
    includes new files.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  23. Add bug isolation howto, scraped from Linus.

    Jon Loeliger committed with Junio C Hamano Nov 8, 2005
    Signed-off-by: Jon Loeliger <jdl@freescale.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>