Permalink
Commits on Jul 29, 2009
  1. GIT 1.6.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 29, 2009
  2. Sync with 1.6.3.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 29, 2009
  3. GIT 1.6.3.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 29, 2009
  4. config.txt: document add.ignore-errors

    Use the description of "--ignore-errors" from git-add.txt as
    inspiration.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bebarino committed with gitster May 31, 2009
  5. request-pull: allow ls-remote to notice remote.$nickname.uploadpack

    The location to pull from should be converted from the configured nickname
    to URL in the message, but ls-remote should be fed the nickname so that
    the command uses remote.$nickname.* variables, most notably "uploadpack".
    
    Signed-off-by: Tom Grennan <tgrennan@redback.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Tom Grennan committed with gitster Jul 29, 2009
Commits on Jul 28, 2009
  1. Update the documentation of the raw diff output format

    This includes mentioning the initial hash output of diff-tree, and
    changes the header to "raw output format" which is more descriptive.
    
    Signed-off-by: David Kågedal <davidk@lysator.liu.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dkagedal committed with gitster Jul 28, 2009
  2. git-rerere.txt: Clarify ambiguity of the config variable

    Use the less ambiguous
    "set variable foo in order to enable bar"
    rather than
    "set variable foo to enable bar" which may trick users into
    assuming that "enable" is a good value for "foo".
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Jul 28, 2009
Commits on Jul 26, 2009
  1. t9143: do not fail if Compress::Zlib is missing

    "git svn gc" will not compress unhandled.log files if
    Compress::Zlib is missing.  However, leftover index files should
    always be removed, so add a test for this behavior as well.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Eric Wong committed with gitster Jul 26, 2009
  2. Trivial path quoting fixes in git-instaweb

    Bodo Schlecht noticed that Instaweb didn't propely quote all
    path instances in the Apache config file it generated.
    
    Acked-by: Eric Wong <normalperson@yhbt.net>
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    loops committed with gitster Jul 18, 2009
  3. Merge branch 'gp/maint-rebase-p-onto'

    * gp/maint-rebase-p-onto:
      Fix rebase -p --onto
    gitster committed Jul 26, 2009
  4. Merge branch 'en/fast-export'

    * en/fast-export:
      fast-export: Document the fact that git-rev-list arguments are accepted
      Add new fast-export testcases
      fast-export: Add a --tag-of-filtered-object option for newly dangling tags
      fast-export: Do parent rewriting to avoid dropping relevant commits
      fast-export: Make sure we show actual ref names instead of "(null)"
      fast-export: Omit tags that tag trees
      fast-export: Set revs.topo_order before calling setup_revisions
    gitster committed Jul 26, 2009
  5. GIT 1.6.4-rc3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 26, 2009
  6. Documentation/config.txt: a variable can be defined on the section he…

    …ader line
    
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nanako Shiraishi committed with gitster Jul 25, 2009
  7. Merge git://git.bogomips.org/git-svn

    * git://git.bogomips.org/git-svn:
      git svn: make minimize URL more reliable over http(s)
      git svn: avoid escaping '/' when renaming/copying files
      t9142: stop httpd after the test
      git svn: the branch command no longer needs the full path
      git svn: revert default behavior for --minimize-url
      git svn: add gc command
    gitster committed Jul 26, 2009
Commits on Jul 25, 2009
  1. git svn: make minimize URL more reliable over http(s)

    In addition to path-based restrictions, Subversion servers over
    http(s) may have access controls implemented via the LimitExcept
    directive in Apache.  In some cases, LimitExcept may be
    (arguably) misconfigured to not allow REPORT requests while
    allowing OPTIONS and PROPFIND.
    
    This caused problems with our existing minimize_url logic that
    only issued OPTIONS and PROPFIND requests when connecting and
    using SVN::Ra::get_latest_revnum.  We now call SVN::Ra::get_log
    if get_latest_revnum succeeds, resulting in a REPORT request
    being sent.  This will increase our chances of tripping access
    controls before we start attempting to fetch history.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Eric Wong committed Jul 25, 2009
  2. Disable asciidoc 8.4.1+ semantics for `{plus}` and friends

    asciidoc 8.4.1 changed the semantics of inline backtick quoting so
    that they disable parsing of inline constructs, i.e.,
    
      Input:	`{plus}`
      Pre 8.4.1:	+
      Post 8.4.1:	{plus}
    
    Fix this by defining the asciidoc attribute 'no-inline-literal'
    (which, per the 8.4.1 changelog, is the toggle to return to the old
    behaviour) when under ASCIIDOC8.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Jul 25, 2009
  3. git svn: avoid escaping '/' when renaming/copying files

    Timothy Schaeffer reported the following:
    > Git-svn has been giving me the following error for some time
    > when calling "git svn dcommit":
    >
    > RA layer request failed: PROPFIND request failed on
    > '/svn/stf/branches/dev/sw%2Fdpemu%2Finclude%2FNetCnxn.h': PROPFIND of
    > '/svn/stf/branches/dev/sw%2Fdpemu%2Finclude%2FNetCnxn.h': 302 Found
    > (https://oursvnrepo.net) at /usr/local/libexec/git-core/git-svn line 508
    >
    > This only occurred when git detected a rename or copy.
    >
    > Following the lead into git-svn.perl,
    > and noticing that some of the '/'s in the path were hex-encoded
    > and some were not,
    > I changed the regex used to find chars
    > to hex-encode in the relative part of the path
    > to exclude '/'.
    > It works, so far.
    > I have included a patch.
    
    While this has previous not been a problem in my experience,
    newer versions of SVN may be stricter and this does not
    introduce regressions in t9115.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Eric Wong committed Jul 25, 2009
  4. t9142: stop httpd after the test

    Otherwise it would fail in subsequent runs if the same
    SVN_HTTPD_PORT was used.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Eric Wong committed Jul 25, 2009
  5. git svn: the branch command no longer needs the full path

    This was introduced in 0b2af45
    ("Fix branch detection when repository root is inaccessible")
    but reintroduced in the previous commit.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Eric Wong committed Jul 25, 2009
  6. git svn: revert default behavior for --minimize-url

    This reverts the --minimize-url behavior change that
    appeared recently in commit 0b2af45
    ("Fix branch detection when repository root is inaccessible").
    
    However, we now allow the option to be turned off by allowing
    "--no-minimize-url" so people with limited-access setups can
    still take advantage of the fix in
    0b2af45.
    
    Also document the behavior and default settings of minimize-url
    in the manpage for the first time.
    
    This introduces a temporary UI regression to allow t9141 to pass
    that will be reverted (fixed) in the next commit.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Eric Wong committed Jul 25, 2009
  7. git svn: add gc command

    Add a git svn gc command that gzips all unhandled.log files, and
    removes all index files under .git/svn.
    
    Signed-off-by: Robert Allan Zeh <robert.a.zeh@gmail.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    razeh committed with Eric Wong Jul 19, 2009
  8. Merge branch 'maint'

    * maint:
      t8005: Nobody writes Russian in shift_jis
    
    Conflicts:
    	t/t8005-blame-i18n.sh
    gitster committed Jul 25, 2009
  9. t8005: Nobody writes Russian in shift_jis

    The second and third tests of this script expected that Russian strings
    are converted between ISO-8859-5 and Shift_JIS in the "blame --porcelain"
    format output correctly.
    
    Sure, many platforms may convert between such a combination, but that is
    only because one of the base character set of Shift_JIS, JIS X 0208,
    defines codepoints for Russian characters (among others); I do not think
    anybody uses Shift_JIS when seriously writing Russian, and it is perfectly
    understandable if iconv() libraries on some platforms fail converting
    between this combination, as it does not matter in reality.
    
    This patch changes the test to verify Japanese strings are converted
    correctly between EUC-JP and Shift_JIS in the same procedure.  The point
    of the test is not about verifying the platform's iconv() library, but to
    see if "git blame" makes correct iconv() library calls when it should.
    
    We could instead use ISO-8859-5 and KOI8-R as the combination, because
    they are both meant to represent Russian, in order to make this test
    meaningful on more platforms, but we already use Shift_JIS vs EUC-JP
    combinations to test other programs in our test suite, so this combination
    is safer from the point of view of the portability.  Besides, I do not
    read nor write Russian; sorry ;-)
    
    This change allows tests to pass on my (friend's) Solaris 5.11 box.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 19, 2009
  10. Merge branch 'maint'

    * maint:
      Fix severe breakage in "git-apply --whitespace=fix"
    gitster committed Jul 25, 2009
  11. Fix severe breakage in "git-apply --whitespace=fix"

    735c674 (Trailing whitespace and no newline fix, 2009-07-22) completely
    broke --whitespace=fix, causing it to lose all the empty lines in a patch.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 25, 2009
  12. Update release notes for 1.6.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 25, 2009
  13. Merge branch 'js/maint-graft-unhide-true-parents'

    * js/maint-graft-unhide-true-parents:
      git repack: keep commits hidden by a graft
      Add a test showing that 'git repack' throws away grafted-away parents
    
    Conflicts:
    	git-repack.sh
    gitster committed Jul 25, 2009
  14. Merge branch 'av/maint-config-reader'

    * av/maint-config-reader:
      After renaming a section, print any trailing variable definitions
      Make section_name_match start on '[', and return the length on success
    gitster committed Jul 25, 2009
  15. Merge branch 'jk/maint-send-email-alias-loop'

    * jk/maint-send-email-alias-loop:
      send-email: detect cycles in alias expansion
    gitster committed Jul 25, 2009
  16. After renaming a section, print any trailing variable definitions

    Signed-off-by: Alex Vandiver <alex@chmrr.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    alexmv committed with gitster Jul 24, 2009
  17. Make section_name_match start on '[', and return the length on success

    Signed-off-by: Alex Vandiver <alex@chmrr.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    alexmv committed with gitster Jul 24, 2009
Commits on Jul 24, 2009
  1. send-email: detect cycles in alias expansion

    With the previous code, an alias cycle like:
    
      $ echo 'alias a b' >aliases
      $ echo 'alias b a' >aliases
      $ git config sendemail.aliasesfile aliases
      $ git config sendemail.aliasfiletype mutt
    
    would put send-email into an infinite loop. This patch
    detects the situation and complains to the user.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jul 23, 2009
  2. Show the presence of untracked files in the bash prompt.

    Added the envvar GIT_PS1_SHOWUNTRACKEDFILES to 'git-completion.bash'.
    When set to a nonempty value, then the char '%' will be shown next
    to the branch name in the bash prompt.
    
    Signed-off-by: Daniel Trstenjak <daniel.trstenjak@science-computing.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Daniel Trstenjak committed with gitster Jul 22, 2009
  3. Merge branch 'maint'

    * maint:
      SunOS grep does not understand -C<n> nor -e
      Fix export_marks() error handling.
      git branch: clean up detached branch handling
      git branch: avoid unnecessary object lookups
      git branch: fix performance problem
      do_one_ref(): null_sha1 check is not about broken ref
    
    Conflicts:
    	Makefile
    gitster committed Jul 24, 2009
  4. SunOS grep does not understand -C<n> nor -e

    The first "grep -C1" test in t7002 does not pass on my SunOS-5.11-i86pc,
    and that is not because our way to spawn external grep is broken, but
    because the native grep does not understand -C<n>.
    
    It turns out that Peff was also using this option himself because our
    Makefile doesn't do that automatically.  Brandon Casey uses SUNWspro
    compiler without having to set this, and it turns out that the compiler
    does not define preprocessor macro __unix__ which made him always use the
    built-in grep, never an external one.
    
    Let's be more explicit and say that we do not use external grep on Suns.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 24, 2009