Permalink
Commits on Jun 3, 2012
  1. Git 1.7.11-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 3, 2012
  2. Sync with 1.7.10.4

    * maint:
      Git 1.7.10.4
    gitster committed Jun 3, 2012
  3. Git 1.7.10.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 3, 2012
  4. Merge branch 'ef/maint-rebase-error-message' into maint

    When "git rebase" was given a bad commit to replay the history on,
    its error message did not correctly give the command line argument
    it had trouble parsing.
    
    By Erik Faye-Lund
    * ef/maint-rebase-error-message:
      rebase: report invalid commit correctly
    gitster committed Jun 3, 2012
Commits on Jun 1, 2012
  1. Update draft release notes to 1.7.11

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 1, 2012
  2. Merge branch 'ef/maint-rebase-error-message'

    By Erik Faye-Lund
    * ef/maint-rebase-error-message:
      rebase: report invalid commit correctly
    gitster committed Jun 1, 2012
  3. Merge branch 'nh/empty-rebase'

    * nh/empty-rebase:
      cherry-pick: regression fix for empty commits
    gitster committed Jun 1, 2012
  4. Merge branch 'vr/rebase-autosquash-does-not-imply-i'

    "git rebase -p" used to pay attention to rebase.autosquash which was
    wrong.  "git rebase -p -i" should, but "git rebase -p" by itself
    should not.
    
    By Vincent van Ravesteijn
    * vr/rebase-autosquash-does-not-imply-i:
      Do not autosquash in case of an implied interactive rebase
    gitster committed Jun 1, 2012
  5. Merge branch 'mm/levenstein-penalize-deletion-less'

    "git tags" used to suggest "git stage" which was nonsense; it should
    have favored "git tag".  Tweak the cost of deletion to correct it.
    
    By Matthieu Moy
    * mm/levenstein-penalize-deletion-less:
      Reduce cost of deletion in levenstein distance (4 -> 3)
    gitster committed Jun 1, 2012
  6. Merge branch 'jl/submodule-report-new-path-once'

    "git submodule init" used to report "registered for path ..."  even
    for submodules that were registered earlier.
    
    By Jens Lehmann
    * jl/submodule-report-new-path-once:
      submodules: print "registered for path" message only once
    gitster committed Jun 1, 2012
  7. Sync with maint

    gitster committed Jun 1, 2012
  8. Start preparing for 1.7.10.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 1, 2012
  9. Merge branch 'ef/http-o-depends-on-gvf' into maint

    A minor compilation fix.
    
    By Erik Faye-Lund
    * ef/http-o-depends-on-gvf:
      Makefile: add missing GIT-VERSION-FILE dependency
    gitster committed Jun 1, 2012
  10. Merge git://github.com/git-l10n/git-po

    By Jiang Xin (4) and others
    via Jiang Xin
    * git://github.com/git-l10n/git-po:
      l10n: Set nplurals of zh_CN.po from 1 to 2
      l10n: zh_CN.po: translate 323 new messages
      l10n: zh.CN.po: update by msgmerge git.pot
      First release translation for Vietnamese
      Init translation for Vietnamese
      l10n: New it.po file with 504 translations
      Update Swedish translation (728t0f0u)
      l10n: Update git.pot (41 new messages)
    gitster committed Jun 1, 2012
  11. Merge branch 'rs/maint-grep-F' into maint

    "git grep -e '$pattern'", unlike the case where the patterns are read from
    a file, did not treat individual lines in the given pattern argument as
    separate regular expressions as it should.
    
    By René Scharfe
    * rs/maint-grep-F:
      grep: stop leaking line strings with -f
      grep: support newline separated pattern list
      grep: factor out do_append_grep_pat()
      grep: factor out create_grep_pat()
    gitster committed Jun 1, 2012
  12. Merge branch 'jk/ident-split-fix' into maint

    An author/committer name that is a single character was mishandled as an
    invalid name by mistake.
    
    By Jeff King
    * jk/ident-split-fix:
      fix off-by-one error in split_ident_line
    gitster committed Jun 1, 2012
  13. Merge branch 'jk/pretty-commit-header-incomplete-line' into maint

    By Jeff King
    * jk/pretty-commit-header-incomplete-line:
      avoid segfault when reading header of malformed commits
    gitster committed Jun 1, 2012
  14. Merge branch 'jk/format-person-part-buffer-limit' into maint

    By Jeff King
    * jk/format-person-part-buffer-limit:
      pretty: avoid buffer overflow in format_person_part
    gitster committed Jun 1, 2012
  15. Merge branch 'ap/checkout-no-progress-for-non-tty' into maint

    "git checkout" gave progress display even when the standard error
    stream was not connected to the tty, which made little sense.
    
    By Avery Pennarun
    * ap/checkout-no-progress-for-non-tty:
      checkout: no progress messages if !isatty(2).
    gitster committed Jun 1, 2012
  16. Merge branch 'maint' of git://github.com/git-l10n/git-po into maint

    By Peter Krefting
    via Peter Krefting
    * 'maint' of git://github.com/git-l10n/git-po:
      Update Swedish translation (728t0f0u)
    gitster committed Jun 1, 2012
  17. i18n: apply: split to fix a partial i18n message

    The 4th arg of "new mode (%o) of %s does not match old mode (%o)%s%s"
    is blank string or string " of ". Even mark the string " of " for a
    complete i18n, this message is still hard to translate right.
    
    Split it into two slight different messages would make l10n teams happy.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jiangxin committed with gitster May 31, 2012
  18. l10n: Set nplurals of zh_CN.po from 1 to 2

    In most cases, plural-forms are unnecessary for Chinese. For example,
    "apple" and "apples" are the same in Chinese, they are both translated
    as "苹果". While there are exceptions, e.g., the plural form of "he",
    "she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
    and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
    
    But what makes 'nplurals=1' hard to work right for Chinese is:
    
        #: bundle.c:192
        #, c-format
        msgid "The bundle requires this ref"
        msgid_plural "The bundle requires these %d refs"
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed May 31, 2012
  19. l10n: zh_CN.po: translate 323 new messages

    Update Simplified Chinese translation for 134 fuzzy, 189 new messages
    from Git v1.7.10.2-548-g9de96.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    Signed-off-by: Zhuang Ya <zhuangya@me.com>
    jiangxin committed May 30, 2012
Commits on May 31, 2012
  1. Makefile: add missing GIT-VERSION-FILE dependency

    In 20fc9bc (Set HTTP user agent to git/GIT_VERSION, 2006-04-04),
    http.o started recording GIT_VERSION, but http.o wasn't added
    to the list of files that depends on GIT-VERSION-FILE.
    
    Fix this, so mofications to GIT-VERSION-FILE will result in an
    updated user-agent string.
    
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    kusma committed with gitster May 31, 2012
  2. l10n: zh.CN.po: update by msgmerge git.pot

    Update of zh_CN.po: 134 fuzzy translations, 189 untranslated messages.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed May 21, 2012
  3. First release translation for Vietnamese

    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    vnwildman committed with jiangxin May 31, 2012
  4. Init translation for Vietnamese

    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    vnwildman committed with jiangxin May 6, 2012
Commits on May 30, 2012
  1. rebase: report invalid commit correctly

    In 9765b6a (rebase: align variable content, 2011-02-06), the code
    to error out was moved up one level. Unfortunately, one reference
    to a function parameter wasn't rewritten as it should, leading to
    the wrong parameter being errored on.
    
    This error was propagated by 71786f5 (rebase: factor out reference
    parsing, 2011-02-06) and merged in 78c6e0f (Merge branch
    'mz/rebase', 2011-04-28).
    
    Correct this by reporting $onto_name istead.
    
    Reported-By: Manuela Hutter <manuelah@opera.com>
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    kusma committed with gitster May 30, 2012
  2. INSTALL: update asciidoc recommendation

    Since commit 6cf378f (docs: stop using asciidoc no-inline-literal),
    we no longer support asciidoc versions less than 8.4.1,
    which introduced inline literals. Note this in the INSTALL
    document.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster May 30, 2012
  3. l10n: New it.po file with 504 translations

    Signed-off-by: Marco Paolone <marcopaolone@gmail.com>
    mapolone committed May 29, 2012
  4. cherry-pick: regression fix for empty commits

    The earlier "--keep-redundant-commit" series broke "cherry-pick"
    that is given a commit whose change is already in the current
    history. Such a cherry-pick would result in an empty change, and
    should stop with an error, telling the user that conflict resolution
    may have made the result empty (which is exactly what is happening),
    but we silently dropped the change on the floor without any message
    nor non-zero exit code.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 30, 2012
Commits on May 29, 2012
  1. submodules: print "registered for path" message only once

    Since 2cd9de3 (submodule add: always initialize .git/config entry) the
    message "Submodule '\$name' (\$url) registered for path '\$sm_path'" is
    printed every time cmd_init() is called, e.g. each time "git submodule
    update" is used with the --init option.
    
    This was not intended and leads to bogus output which can confuse users
    and build systems. Apart from that the $url variable was not set after the
    first run which did the actual initialization and only "()" was printed
    in subsequent runs where "($url)" was meant to inform the user about the
    upstream repo.
    
    Fix that by moving the say command in question into the if block where the
    url is initialized, restoring the behavior that was in place before the
    2cd9de3 commit. While at it also remove the comment which still describes
    the logic used before 2cd9de3 and add a comment about how things work now.
    
    Reported-by: Nicolas Viennot and Sid Nair <nicolas@viennot.com>
    Reported-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jlehmann committed with gitster May 28, 2012
  2. Merge git://bogomips.org/git-svn

    By Jonathan Nieder
    via Eric Wong
    * git://bogomips.org/git-svn:
      git-svn: make Git::SVN::Fetcher a separate file
      git-svn: rename SVN::Git::* packages to Git::SVN::*
      git-svn: move Git::SVN::Prompt into its own file
    gitster committed May 29, 2012
  3. t5701: modernize style

    This test is pretty old and did not follow some of our more
    modern best practices. In particular:
    
      1. It chdir'd all over the place, leaving later tests to
         deal with the fallout. Do our chdirs in subshells
         instead.
    
      2. It did not use test_must_fail.
    
      3. It did not use test_line_count.
    
      4. It checked for the non-existence of a ref by looking in the
         .git/refs directory (since we pack refs during clone
         these days, this will always be succeed, making the
         test useless).
    
         Note that one call to "-e .git/refs/..." remains,
         because it is checking for the existence of a symbolic
         ref, not a ref itself.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster May 26, 2012
  4. Merge branch 'va/git-p4-test'

    By Vitor Antunes
    * va/git-p4-test:
      git-p4: Clean up branch test cases
      git-p4: Verify detection of "empty" branch creation
      git-p4: Test changelists touching two branches
    gitster committed May 29, 2012