Permalink
Commits on Apr 26, 2009
  1. t4202: fix typo

    torvalds authored and gitster committed Apr 26, 2009
    While I did a
    
    	make -j64 test > ~/t.out
    
    to check my previous patch (in case some test actually tested 'trustctime'
    or something), I noticed this one. Somebody has speeling trouble:
    
    	t4202-log.sh: line 345: test_expect_sucess: command not found
    
    Fixed thus.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 25, 2009
  1. Add an option not to use link(src, dest) && unlink(src) when that is …

    dscho authored and gitster committed Apr 25, 2009
    …unreliable
    
    It seems that accessing NTFS partitions with ufsd (at least on my EeePC)
    has an unnerving bug: if you link() a file and unlink() it right away,
    the target of the link() will have the correct size, but consist of NULs.
    
    It seems as if the calls are simply not serialized correctly, as single-stepping
    through the function move_temp_to_file() works flawlessly.
    
    As ufsd is "Commertial software" (sic!), I cannot fix it, and have to work
    around it in Git.
    
    At the same time, it seems that this fixes msysGit issues 222 and 229 to
    assume that Windows cannot handle link() && unlink().
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. connect: replace inet_ntop with getnameinfo

    d0k authored and gitster committed Apr 24, 2009
    inet_ntop is not protocol independent.
    getnameinfo(3) is part of POSIX and is available when getaddrinfo(3) is.
    This code is only compiled when NO_IPV6 isn't defined.
    
    The old method was buggy anyway, not every ipv6 address was converted
    properly because the buffer (addr) was too small.
    
    Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Documentation: git-clean: make description more readable

    wjl authored and gitster committed Apr 25, 2009
    The existing text is a little bit awkward. This rewrites the description
    section to be more readable and friendly.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Documentation: git-clean: fix minor grammatical errors

    wjl authored and gitster committed Apr 25, 2009
    There were a few minor grammatical errors that made this paragraph hard
    to read. This patch fixes the errors in a very minimal manner.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Remove obsolete bug warning in man git-update-server-info

    sitaramc authored and gitster committed Apr 25, 2009
    The bug referred to was fixed in 60d0526
    
    Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. t7700-repack: repack -a now works properly, expect success from test

    Brandon Casey authored and gitster committed Apr 24, 2009
    Since the recent rework of the object listing mechanism of
    pack-objects/rev-list, git-repack now properly packs objects from alternate
    repositories even when the local repository contains packs.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'

    Brandon Casey authored and gitster committed Apr 24, 2009
    The '--no-thread' option is a Getopt::Long boolean option. The '--no-'
    prefix (as in --no-thread) for boolean options is not supported in
    Getopt::Long version 2.32 which was released with Perl 5.8.0. This version
    only supports '--no' as in '--nothread'.  More recent versions of
    Getopt::Long, such as version 2.34, support either prefix. So use the older
    form in the tests.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. progress bar: round to the nearest instead of truncating down

    Nicolas Pitre authored and gitster committed Apr 24, 2009
    Often the throughput output is requested when the data read so far is
    one smaller than multiple of 1024; because 1023/1024 is ~0.999, it often
    shows up as 0.99 because the code currently truncates.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. GIT 1.6.3-rc2

    gitster committed Apr 25, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. Merge branch 'maint'

    gitster committed Apr 25, 2009
    * maint:
      test-genrandom: Add newline to usage string
  11. Merge branch 'maint-1.6.1' into maint

    gitster committed Apr 25, 2009
    * maint-1.6.1:
      test-genrandom: Add newline to usage string
  12. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 25, 2009
    * maint-1.6.0:
      test-genrandom: Add newline to usage string
Commits on Apr 24, 2009
  1. t7800: respect NO_PERL

    peff authored and gitster committed Apr 24, 2009
    Difftool is written in perl, so we don't build it if NO_PERL
    is set.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. remote.c: do not trigger remote.<name>.<var> codepath for two-level n…

    j6t authored and gitster committed Apr 23, 2009
    …ames
    
    If the config file contains a section like this:
    
        [remote]
                default = foo
    
    (it should be '[remotes]') then commands like
    
        git status
        git checkout
        git branch -v
    
    fail even though they are not obviously related to remotes. (These
    commands write "ahead, behind" information and, therefore, access the
    per-remote information).
    
    Unknown configuration keys should be ignored, not trigger errors.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. builtin-help: silently tolerate unknown keys

    j6t authored and gitster committed Apr 23, 2009
    If for some reason the config file contains a key without a subkey like
    
        [man]
            foo = bar
    
    then even a plain
    
        git help
    
    produces an error message. With this patch such an entry is ignored.
    
    Additionally, the warning about unknown sub-keys is removed. It could
    become annoying if new sub-keys are introduced in the future, and then
    the configuration is read by an old version of git that does not know
    about it.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Explain seemingly pointless use of system in difftool

    raalkml authored and gitster committed Apr 23, 2009
    Portability reasons.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 23, 2009
  1. Makefile: ignore perl/ subdirectory under NO_PERL

    gitster committed Apr 23, 2009
    The install target still descends into perl subdirectory when NO_PERL is
    requested.  Fix this.
    
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. config.txt: Make configuration paragraph more consistent

    bebarino authored and gitster committed Apr 23, 2009
    By renaming 'information' to 'configuration' we capture more clearly
    what a configuration file holds.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. config.txt: clarify sentences in the configuration and syntax sections

    bebarino authored and gitster committed Apr 23, 2009
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. config.txt: add missing 'the's and make words plural

    bebarino authored and gitster committed Apr 23, 2009
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. git-format-patch.txt: general rewordings and cleanups

    bebarino authored and gitster committed Apr 23, 2009
    Clarify --no-binary description using some words from the original
    commit 37c22a4 (add --no-binary, 2008-05-9). Cleanup --suffix
    description. Add --thread style option to synopsis and reorganize it a
    bit. Clarify renaming patches example and the configuration paragraph.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. git-show-branch.txt: cleanup example description

    bebarino authored and gitster committed Apr 23, 2009
    Add a missing quote and properly escape the ' character so docs don't
    look odd. Add 'the' to make some sentences more gramatically correct.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Documentation: use lowercase for shallow and deep threading

    bebarino authored and gitster committed Apr 23, 2009
    Even when a sentence is started with 'shallow' or 'deep' use the
    lowercase version to maintain consistency.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. config.txt: add missing format.{subjectprefix,cc,attach} variables

    bebarino authored and gitster committed Apr 23, 2009
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. test-genrandom: Add newline to usage string

    bebarino authored and gitster committed Apr 23, 2009
    A minor fix to place the terminal input on a new line if test-genrandom
    is run with no arguments.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. Merge branch 'jc/maint-read-tree-multi'

    gitster committed Apr 23, 2009
    * jc/maint-read-tree-multi:
      checkout branch: prime cache-tree fully
      read-tree -m A B: prime cache-tree from the switched-to tree
      Move prime_cache_tree() to cache-tree.c
      read-tree A B: do not corrupt cache-tree
  11. Add parsing of elm aliases to git-send-email

    wfp5p authored and gitster committed Apr 22, 2009
    elm stores a text file version of the aliases that is
    <alias> = <comment> = <email address>
    
    This adds the parsing of this file to git-send-email
    
    Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. Convert to use quiet option when available

    Dan Loewenherz authored and gitster committed Apr 23, 2009
    A minor fix that eliminates usage of "2>/dev/null" when --quiet or
    -q has already been implemented.
    
    Signed-off-by: Dan Loewenherz <daniel.loewenherz@yale.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. Fix more typos/spelling in comments

    mjg authored and gitster committed Apr 22, 2009
    A few more fixes on top of the automatic spell checker generated ones.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. Fix typos / spelling in comments

    MikeRalphson authored and gitster committed Apr 17, 2009
    Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. Documentation: git-svn: fix a grammatical error without awkwardness

    wjl authored and gitster committed Apr 22, 2009
    The way the sentence is currently written, there needs to be an "its",
    but this leads to: "however the remote wildcard may be anywhere as long
    as it's its own" which is awkward to read.
    
    Instead, this patch fixes he grammar in a simpler way.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  16. Documentation: git-svn: fix spurious bolding that mangles the output

    wjl authored and gitster committed Apr 22, 2009
    Without this fix, the output looks like:
    
    "Keep in mind that the  (asterisk) wildcard of the local ref (right of
    the :) *must be the ..." -- with half the sentence spuriously bold.
    
    This fixes the problem by simply escaping asciidoc syntax as suggested
    by Jeff King <peff@peff.net>.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  17. Wait for git diff to finish in git difftool

    raalkml authored and gitster committed Apr 22, 2009
    In ActivetState Perl, exec does not wait for the started program. This
    breaks difftool tests and may cause unexpected behaviour: git difftool
    has returned, but the rest of code (diff and possibly the interactive
    program are still running in the background.
    
    Acked-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18. graph API: fix a bug in the rendering of octopus merges

    allancaffee authored and gitster committed Apr 22, 2009
    An off by one error was causing octopus merges with 3 parents to not be
    rendered correctly.  This regression was introduced by 427fc5.
    
    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>