Permalink
Switch branches/tags
Commits on Jul 15, 2010
  1. Documentation: add submodule.* to the big configuration variable list

    jrn authored and gitster committed Jul 15, 2010
    The url, path, and the update items in [submodule "foo"] stanzas
    are nicely explained in the .gitmodules and ‘git submodule’
    documentation.  Point there from the config documentation.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. gitmodules.5: url can be a relative path

    jrn authored and gitster committed Jul 15, 2010
    There is already excellent documentation for this facility in
    git-submodule.1, but it is not so discoverable.
    
    Relative paths in .gitmodules can be useful for serving the
    same repository over multiple protocols, for example.
    Thanks to Peter for pointing this out.
    
    Cc: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. gitweb: fix esc_url

    pksunkara authored and gitster committed Jul 15, 2010
    Earlier, 452e225 (gitweb: fix esc_param, 2009-10-13) fixed CGI escaping
    rules used in esc_url.  A very similar logic exists in esc_param and needs
    to be fixed the same way.
    
    Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 14, 2010
  1. git --paginate: paginate external commands again

    jrn authored and gitster committed Jul 14, 2010
    73e25e7 (git --paginate: do not commit pager choice too early,
    2010-06-26) failed to take some cases into account.
    
    1b. Builtins that do not use RUN_SETUP (like git config) do
        not find GIT_DIR set correctly when the pager is launched
        from run_builtin().  So the core.pager configuration is
        not honored from subdirectories of the toplevel for them.
    
    4a. External git commands (like git request-pull) relied on the
        early pager launch to take care of handling the -p option.
        Ever since 73e25e7, they do not honor the -p option at all.
    
    4b. Commands invoked through ! aliases (like ls) were also relying
        on the early pager launch.
    
    Fix (4a) by launching the pager (if requested) before running such a
    “dashed external”.  For simplicity, this still does not search for a
    .git directory before running the external command; when run from a
    subdirectory of the toplevel, therefore, the “[core] pager”
    configuration is still not honored.
    
    Fix (4b) by launching pager if requested before carrying out such an
    alias.  Actually doing this has no effect, since the pager (if any)
    would have already been launched in a failed attempt to try a
    dashed external first.  The choice-of-pager-not-honored-from-
    subdirectory bug still applies here, too.
    
    (1b) is not a regression.  There is no need to fix it yet.
    
    Noticed by Junio.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. MERGE_RR is in .git, not .git/rr-cache

    jaysoffian authored and gitster committed Jul 14, 2010
    0af0ac7 (Move MERGE_RR from .git/rr-cache/ into .git/) moved the
    location of MERGE_RR but I found a few references to the old
    location.
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. merge-tree: fix where two branches share no changes

    wpalmer authored and gitster committed Jul 14, 2010
    15b4f7a (merge-tree: use ll_merge() not xdl_merge(), 2010-01-16)
    introduced a regression to merge-tree to cause it to segfault when merging
    files which existed in one branch, but not in the other or in the
    merge-base. This was caused by referencing entry->path at a time when
    entry was known to be possibly-NULL.
    
    To correct the problem, we save the path of the entry we came in with,
    as the path should be the same among all the stages no matter which
    sides are involved in the merge.
    
    Signed-off-by: Will Palmer <wmpalmer@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. add basic tests for merge-tree

    wpalmer authored and gitster committed Jul 14, 2010
    merge-tree had no test cases, so here we add some very basic tests for
    it, including some known-breakages.
    
    [jc: with obvious/trivial fixups]
    
    Signed-off-by: Will Palmer <wmpalmer@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Git 1.7.2-rc3

    gitster committed Jul 14, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Merge branch 'jc/read-tree-cache-tree-fix'

    gitster committed Jul 14, 2010
    * jc/read-tree-cache-tree-fix:
      Fix "read-tree -m A B" priming the cache-tree
  7. Use dev_t for device id (st_dev) from stat in setup_git_directory_gen…

    harinath authored and gitster committed Jul 13, 2010
    …tly()
    
    The original declaration was int, which seems to cause trouble on my
    machine.  It causes spurious "filesystem boundary" errors when running
    the testsuite.  The cause seems to be
    
      $ stat -c%d .
      2147549952
    
    which is too large for a 32-bit int type.
    
    Using the correct type, dev_t, solves the issue.  (Because I'm
    paranoid and forgetful, I checked -- yes, Unix v7 had dev_t.)
    
    Other uses of st_dev seem to be reasonably safe.   fill_stat_cache_info
    truncates it to an 'unsigned int', but that value seems to be used only
    to validate the cache, and only if USE_STDEV is defined.
    
    Signed-off-by: Raja R Harinath <harinath@hurrynot.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 13, 2010
  1. diff A...B: give one possible diff when there are more than one merge…

    gitster committed Jul 13, 2010
    …-base
    
    We instead showed a combined diff that explains one of the randomly
    chosen merge-base as if it were the result of merging all the other
    merge bases and two tips given, which made no sense at all.
    
    An alternative is to simply fail such a request, telling the user that
    there are criss-cross merges, but it wouldn't be so helpful.
    
    Noticed by James Pickens.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint'

    gitster committed Jul 13, 2010
    * maint:
      git fetch documentation: describe short '-p' synonym to '--prune' option
      format-patch: document the format.to configuration setting
  3. git fetch documentation: describe short '-p' synonym to '--prune' option

    orenhe authored and gitster committed Jul 13, 2010
    It's already implemented, just undocumented.
    
    Signed-off-by: Oren Held <orenhe@il.ibm.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. format-patch: document the format.to configuration setting

    Miklos Vajna authored and gitster committed Jul 12, 2010
    [jc: with simplification from Jonathan Nieder]
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 12, 2010
  1. git add: Add the "--ignore-missing" option for the dry run

    jlehmann authored and gitster committed Jul 9, 2010
    Sometimes it is useful to know if a file or directory will be ignored
    before it is added to the work tree. An example is "git submodule add",
    where it would be really nice to be able to fail with an appropriate
    error message before the submodule is cloned and checked out.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. test-lib: TAP compliance for skipping tests on request

    mjg authored and gitster committed Jul 12, 2010
    Make the output TAP compliant for tests skipped on request (GIT_SKIP_TESTS).
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. test-lib: simplify GIT_SKIP_TESTS loop

    mjg authored and gitster committed Jul 12, 2010
    04ece59 (GIT_SKIP_TESTS: allow users to omit tests that are known to break, 2006-12-28)
    introduced GIT_SKIP_TESTS, and since then we have had two nested loops
    iterating over GIT_SKIP_TESTS with the same loop variable.
    
    Reduce this to one loop.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'maint'

    gitster committed Jul 12, 2010
    * maint:
      Documentation: Spelling fix in protocol-capabilities.txt
      checkout: accord documentation to what git does
      t0005: work around strange $? in ksh when program terminated by a signal
  5. t3000 (ls-files -o): modernize style

    jrn authored and gitster committed Jul 11, 2010
    This script is part of the second batch of tests, from the same day
    the test infrastructure was added to git.  Update it to use a more
    modern style in the spirit of v1.6.4-rc0~45^2~2 (2009-05-22).
    In particular:
    
     - Put setup code inside test assertions, to avoid unexpected
       breakages and avoid stray output without -v (as t/README
       recommends); and
    
     - Put the test title on the same line as the "test_expect_success",
       and end the line with a single-quote to begin the body of the test
       which is one multi-line string.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 10, 2010
  1. Documentation: Spelling fix in protocol-capabilities.txt

    frsk authored and gitster committed Jul 10, 2010
    Signed-off-by: Fredrik Skolmli <fredrik@frsk.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 9, 2010
  1. merge-recursive: use "up-to-date" instead of "uptodate" in error mess…

    Nicolas Sebrecht authored and gitster committed Jul 9, 2010
    …age for consistency
    
    Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. checkout: accord documentation to what git does

    Nicolas Sebrecht authored and gitster committed Jul 9, 2010
    Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. t0005: work around strange $? in ksh when program terminated by a signal

    j6t authored and gitster committed Jul 9, 2010
    ksh93 is known to report $? of programs that terminated by a signal as
    256 + signal number instead of 128 + signal number like other POSIX
    compliant shells (ksh's behavior is still POSIX compliant in this regard).
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix

    gitster committed Jul 9, 2010
    * ko/master: (2325 commits)
      Git 1.7.2-rc2
      backmerge a few more fixes to 1.7.1.X series
      fix git branch -m in presence of cross devices
      t/t0006: specify timezone as EST5 not EST to comply with POSIX
      add missing && to submodule-merge testcase
      t/README: document more test helpers
      test-date: fix sscanf type conversion
      xdiff: optimise for no whitespace difference when ignoring whitespace.
      gitweb: Move evaluate_gitweb_config out of run_request
      parse_date: fix signedness in timezone calculation
      t0006: test timezone parsing
      rerere.txt: Document forget subcommand
      t/README: proposed rewording...
      t/README: Document the do's and don'ts of tests
      t/README: Add a section about skipping tests
      t/README: Document test_expect_code
      t/README: Document test_external*
      t/README: Document the prereq functions, and 3-arg test_*
      t/README: Typo: paralell -> parallel
      t/README: The trash is in 't/trash directory.$name'
      ...
    
    Conflicts:
    	builtin-read-tree.c
  5. diff.c: fix a graph output bug

    byang authored and gitster committed Jul 8, 2010
    When --graph is in effect, the line-prefix typically has colored graph
    line segments and ends with reset.  The color sequence "set" given to
    this function is for showing the metainfo part of the patch text and
    (1) it should not be applied to the graph lines, and (2) it will be
    reset at the end of line_prefix so it won't be in effect anyway.
    
    Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. tests: Use skip_all=* to skip tests

    avar authored and gitster committed Jul 8, 2010
    Change tests to skip with skip_all=* + test_done instead of using say
    + test_done.
    
    This is a follow-up to "tests: Skip tests in a way that makes sense
    under TAP" (fadb515). I missed these cases when prepearing that
    patch, hopefully this is all of them.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Fix "read-tree -m A B" priming the cache-tree

    gitster committed Jul 9, 2010
    In 456156d a shortcut to priming the index tree reference was
    introduced, but the justification for it was completely bogus.
    
    "read-tree -m A B" is to take the index (and the working tree)
    that is largely based on (but does not have to match exactly) A
    and update it to B, while carrying the local change that does
    not overlap the difference between A and B, so there is no reason
    to expect that the resulting index should match the tree B.
    
    Noticed and test provided by Heiko Voigt.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Reorganize `git-log' man page to clarify common diff options.

    elibarzilay authored and gitster committed Jul 8, 2010
    This will reduce considerably the common confusion where people miss the
    `--follow' option, and wonder why `-M'/`-C' is not working.
    
    * Move the diff options include to after the log-specific flags, and add
      a "Common diff options" subtitle before them.  (These options apply
      only when patches are shown, which is not a common use case among
      newbies, so having them first is confusing.)
    
    * Move the `--follow' description to the top of the listed options.  The
      options before that seem less important: `--full-diff' applies only
      when patches are shown, `--source' and `--decorate' are less useful
      with many common commit specifications.
    
    * Clarify that `--follow' works only for a single path argument.
    
    Signed-off-by: Eli Barzilay <eli@barzilay.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 8, 2010
  1. t9118 (git-svn): prevent early failure from taking down later tests

    jrn authored and Eric Wong committed Jul 8, 2010
    When test #2 fails, the cwd is project/, causing all the
    remaining tests in the same script to get confused and fail.
    
    So in the spirit of v1.7.1.1~53^2~10 (t5550-http-fetch: Use subshell
    for repository operations, 2010-04-17), use a subshell for svn
    working copy operations.  This way, the cwd will reliably return
    to the top of the trash directory and later tests can still be run
    when a command has failed.
    
    Reported-by: A Large Angry SCM <gitzilla@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  2. t9118: avoid PEG revision identifier in tests

    mjg authored and Eric Wong committed Jul 8, 2010
    @ is SVN's identifier for PEG revisions. But SVN's treatment of PEG
    identifiers in copy target URLs changed in r954995/r952973, i.e. between
    1.6.11 and 1.6.12. They get eaten now (which is considered the right
    way).
    
    Therefore, avoid the @ in the tests with funky branch names.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Acked-by: Eric Wong <normalperson@yhbt.net>
Commits on Jul 7, 2010
  1. grep -O: Do not pass color sequences as filenames to pager

    nazri authored and gitster committed Jul 3, 2010
    With a .gitconfig like this:
    
     [color]
    	ui = auto
     [color "grep"]
    	filename = magenta
    
    if stdout is a terminal, the grep machinery will output the color
    sequence \e[36m before each filename in its output.
    
    In the case of "git grep -O foo", output is argv for the pager.
    Disable color when calling the grep machinery in this case.
    
    Signed-off-by: Nazri Ramliy <ayiehere@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Git 1.7.2-rc2

    gitster committed Jul 7, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'ab/tap'

    gitster committed Jul 7, 2010
    * ab/tap:
      t/README: document more test helpers
      t/README: proposed rewording...
      t/README: Document the do's and don'ts of tests
      t/README: Add a section about skipping tests
      t/README: Document test_expect_code
      t/README: Document test_external*
      t/README: Document the prereq functions, and 3-arg test_*
      t/README: Typo: paralell -> parallel
      t/README: The trash is in 't/trash directory.$name'
      t/t9700/test.pl: don't access private object members, use public access methods
      t9700: Use Test::More->builder, not $Test::Builder::Test
      tests: Say "pass" rather than "ok" on empty lines for TAP
      tests: Skip tests in a way that makes sense under TAP
      test-lib: output a newline before "ok" under a TAP harness
      test-lib: Make the test_external_* functions TAP-aware
      test-lib: Adjust output to be valid TAP format
  4. Merge branch 'maint'

    gitster committed Jul 7, 2010
    * maint:
      backmerge a few more fixes to 1.7.1.X series
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
      fix git branch -m in presence of cross devices
    
    Conflicts:
    	RelNotes
    	builtin/rev-parse.c
  5. backmerge a few more fixes to 1.7.1.X series

    gitster committed Jul 7, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>