Permalink
Commits on Mar 14, 2012
  1. Git 1.7.10-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 14, 2012
Commits on Mar 13, 2012
  1. Merge branch 'jc/i18n-shell-script-gettext'

    The auto detection was testing if a fixed string that is known to be
    non-empty is empty by mistake.
    
    * jc/i18n-shell-script-gettext:
      i18n: fix auto detection of gettext scheme for shell scripts
    gitster committed Mar 13, 2012
  2. Merge branch 'jc/maint-undefined-i18n-observation-test'

    It was unclear what a test in t0204 wanted to check; it turns out
    that it was only to observe an undefined behaviour of the system,
    and did not anticipate one kind of reasonable error behaviour.
    
    * jc/maint-undefined-i18n-observation-test:
      t0204: clarify the "observe undefined behaviour" test
    gitster committed Mar 13, 2012
  3. Merge branch 'ms/maint-config-error-at-eol-linecount'

    When "git config" diagnoses an error in a configuration file and
    shows the line number for the offending line, it miscounted if the
    error was at the end of line.
    
    By Martin Stenberg
    * ms/maint-config-error-at-eol-linecount:
      config: report errors at the EOL with correct line number
    
    Conflicts:
    	t/t1300-repo-config.sh
    gitster committed Mar 13, 2012
  4. Merge branch 'ph/rerere-doc'

    By Phil Hord
    * ph/rerere-doc:
      rerere: Document 'rerere remaining'
    gitster committed Mar 13, 2012
  5. am: officially deprecate -b/--binary option

    We have had these options as harmless no-op for more than 3 years without
    officially deprecating them.  Let's announce the deprecation and start
    warning against their use, but without failing the command just not yet,
    so that we can later repurpose the option if we want to in the future.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 13, 2012
Commits on Mar 12, 2012
  1. Update draft release notes to 1.7.10 before -rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 12, 2012
  2. Merge branch 'az/verify-tag-use-gpg-config'

    "git tag -s" honored "gpg.program" configuration variable since
    1.7.9, but "git tag -v" and "git verify-tag" didn't.
    
    By Alex Zepeda
    * az/verify-tag-use-gpg-config:
      verify-tag: Parse GPG configuration options.
    gitster committed Mar 12, 2012
  3. Sync with 1.7.9.4

    gitster committed Mar 12, 2012
  4. Git 1.7.9.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 12, 2012
  5. Merge branch 'tr/maint-bundle-boundary' into maint

    "git bundle" did not record boundary commits correctly when there
    are many of them.
    
    By Thomas Rast
    * tr/maint-bundle-boundary:
      bundle: keep around names passed to add_pending_object()
      t5510: ensure we stay in the toplevel test dir
      t5510: refactor bundle->pack conversion
    gitster committed Mar 12, 2012
  6. Merge branch 'jc/maint-diff-patch-header' into maint

    "git diff-index" and its friends at the plumbing level showed the
    "diff --git" header and nothing else for a path whose cached stat
    info is dirty without actual difference when asked to produce a
    patch. This was a longstanding bug that we could have fixed long
    time ago.
    
    By Junio C Hamano
    * jc/maint-diff-patch-header:
      diff -p: squelch "diff --git" header for stat-dirty paths
      t4011: illustrate "diff-index -p" on stat-dirty paths
      t4011: modernise style
    gitster committed Mar 12, 2012
  7. Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into…

    … maint
    
    "gitweb" did use quotemeta() to prepare search string when asked to
    do a fixed-string project search, but did not use it by mistake and
    used the user-supplied string instead.
    
    By Jakub Narebski
    * jn/maint-do-not-match-with-unsanitized-searchtext:
      gitweb: Fix fixed string (non-regexp) project search
    gitster committed Mar 12, 2012
  8. Merge branch 'jc/am-3-nonstandard-popt' into maint

    The code to synthesize the fake ancestor tree used by 3-way merge
    fallback in "git am" was not prepared to read a patch created with
    a non-standard -p<num> value.
    
    * jc/am-3-nonstandard-popt:
      test: "am -3" can accept non-standard -p<num>
      am -3: allow nonstandard -p<num> option
    gitster committed Mar 12, 2012
  9. git-am: error out when seeing -b/--binary

    The --binary option to git-apply has been a no-op since 2b6eef9 (Make
    apply --binary a no-op., 2006-09-06) and was deprecated in cb3a160
    (git-am: ignore --binary option, 2008-08-09).
    
    We could remove it outright, but let's be nice to people who still
    have scripts saying 'git am -b' (if they exist) and tell them the
    reason for the sudden failure.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Thomas Rast committed with gitster Mar 12, 2012
  10. i18n: fix auto detection of gettext scheme for shell scripts

    A new code added by ad17ea7 (add a Makefile switch to avoid gettext
    translation in shell scripts, 2012-01-23) tried to optionally force
    a gettext scheme to "fallthrough", but ended up forcing it to everybody.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 12, 2012
  11. config: report errors at the EOL with correct line number

    A section in a config file with a missing "]" reports the next line
    as bad, same goes to a value with a missing end quote.
    
    This happens because the error is not detected until the end of the
    line, when line number is already increased. Fix this by decreasing
    line number by one for these cases.
    
    Signed-off-by: Martin Stenberg <martin@gnutiken.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Martin Stenberg committed with gitster Mar 9, 2012
  12. Merge https://github.com/git-l10n/git-po

    Updates to localized messages for zn_CN and sv locales.
    
    via Jiang Xin
    * https://github.com/git-l10n/git-po:
      l10n: Improve zh_CN translation for msg "not something we can merge"
      l10n: Improve zh_CN trans for msg that cannot fast-forward
      l10n: Update zh_CN translation for 1.7.10-rc0
      Update Swedish translation (732t0f0u).
      po/sv.po: add Swedish translation
      l10n: Update git.pot (1 new message)
      l10n: Update zh_CN translation for 1.7.9.2
      l10n: Improve commit msg for zh_CN translation
      l10n: Improve zh_CN translation for msg that make empty commit when amend.
      l10n: Improve zh_CN translation for empty cherry-pick msg.
      l10n: Improve zh_CN translation for msg about branch deletion deny
      l10n: Improve zh_CN translation for lines insertion and deletion.
    gitster committed Mar 12, 2012
Commits on Mar 9, 2012
  1. t0204: clarify the "observe undefined behaviour" test

    This test asks for an impossible conversion to the system by
    preparing an UTF-8 translation with characters that cannot be
    expressed in ISO-8859-1, and then asking the message shown in
    ISO-8859-1.  Even though the behaviour against such a request is
    undefined, it may be interesting to see what the system does, and
    the purpose of this test is to see if there are platforms that
    exhibit behaviour that we haven't seen.
    
    The original recognized two known modes of behaviour:
    
     - the key used to query the message catalog ("TEST: Old English
       Runes"), saying "I cannot do that i18n".
     - impossible characters replaced with ASCII "?", saying "I punt".
    
    but they were treated totally differently.  The test simply issued
    an informational message "Your system punts on this one" for the
    first error mode, while it diagnosed the latter as "Your system is
    good; you pass!".
    
    It turns out that Mac OS X exhibits a third mode of error behaviour,
    to spew out the raw value stored in the message catalog.  The test
    diagnosed this behaviour as "broken", but it is merely trying to do
    its best to respond to an impossible request by saying "I punt" in a
    way that is slightly different from the second one.
    
    Update the offending test to make it clear what is (and is not)
    being tested, update the code structure so that newly discovered
    error mode can easily be added to it later, and reword the message
    that comes from a failing case to clarify that it is not the system
    that is broken when it fails, but merely that the behaviour is not
    something we have seen.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 7, 2012
  2. p4000: use -3000 when promising -3000

    The 'log -3000 (baseline)' test accidentally still used -1000 from an
    earlier version.
    
    Noticed-by: Lawrence Holding <Lawrence.Holding@cubic.com>
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Mar 9, 2012
Commits on Mar 8, 2012
  1. rerere: Document 'rerere remaining'

    This adds the 'remaining' command to the documentation of
    'git rerere'. This command was added in ac49f5c (Feb 16 2011;
    Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>) but
    it was never documented.
    
    Touch up the other rerere commands to reduce noise.
    
    First noticed by Vincent van Ravesteijn.
    
    Signed-off-by: Phil Hord <phil.hord@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    phord committed with gitster Mar 8, 2012
  2. verify-tag: Parse GPG configuration options.

    Modify verify-tag to load relevant GPG variables from the git
    configuratio file.  This allows git tag -v to use an alternative
    GPG binary in the same way that git tag -s does.
    
    Signed-off-by: Alex Zepeda <alex@inferiorhumanorgans.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    inferiorhumanorgans committed with gitster Mar 8, 2012
  3. Update draft release notes to 1.7.10

    Also apply typofixes people on the list helped spotting and
    correcting.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 8, 2012
  4. Merge branch 'kb/maint-prune-rmdir-closedir'

    By Karsten Blees
    * kb/maint-prune-rmdir-closedir:
      fix deletion of .git/objects sub-directories in git-prune/repack
    gitster committed Mar 8, 2012
  5. Merge branch 'jl/maint-submodule-relative'

    By Jens Lehmann (3) and Johannes Sixt (1)
    * jl/maint-submodule-relative:
      submodules: fix ambiguous absolute paths under Windows
      submodules: refactor computation of relative gitdir path
      submodules: always use a relative path from gitdir to work tree
      submodules: always use a relative path to gitdir
    gitster committed Mar 8, 2012
  6. Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext'

    By Jakub Narebski
    * jn/maint-do-not-match-with-unsanitized-searchtext:
      gitweb: Fix fixed string (non-regexp) project search
    
    Conflicts:
    	gitweb/gitweb.perl
    gitster committed Mar 8, 2012
  7. Merge branch 'vr/branch-doc'

    By Vincent van Ravesteijn
    * vr/branch-doc:
      Documentation/git-branch: add default for --contains
      Documentation/git-branch: fix a typo
      Documentation/git-branch: cleanups
    gitster committed Mar 8, 2012
  8. perf: export some important test-lib variables

    The only bug right now is that $GIT_TEST_CMP is needed for test_cmp to
    work.
    
    However, we also export the three most important paths for tests:
    
      TEST_DIRECTORY
      TRASH_DIRECTORY
      GIT_BUILD_DIR
    
    Since they are available within test_expect_success, a future test
    writer may expect them to also be defined in test_perf.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Mar 8, 2012
  9. perf: load test-lib-functions from the correct directory

    Loading it in the subshells still referred to $TEST_DIRECTORY/..,
    which was only correct in preliminary versions of perf-lib.sh
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Mar 8, 2012
  10. l10n: Improve zh_CN translation for msg "not something we can merge"

    Signed-off-by: Thynson <lanxingcan@gmail.com>
    thynson committed with jiangxin Mar 3, 2012
  11. l10n: Improve zh_CN trans for msg that cannot fast-forward

    Signed-off-by: Thynson <lanxingcan@gmail.com>
    thynson committed with jiangxin Mar 3, 2012
  12. l10n: Update zh_CN translation for 1.7.10-rc0

    Translate 1 new message from Git 1.7.10-rc0.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Mar 8, 2012
  13. Update Swedish translation (732t0f0u).

    This update includes a replay of some review fixes from the initial
    translation run in 2010, which I cannot find having committed anywhere.
    
    Add myself to the po/TEAMS file as well.
    
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    nafmo committed Mar 8, 2012
  14. po/sv.po: add Swedish translation

    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    (cherry picked from commit 54ce070)
    nafmo committed Sep 12, 2010
  15. l10n: Update git.pot (1 new message)

    Update file 'po/git.pot' to v1.7.10-rc0:
    
    * Add 1 new l10n string in the new generated "git.pot" file at line:
      191
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Mar 8, 2012