From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Jul 2013 19:04:01 +0000 (-0700)
Subject: Merge branch 'as/log-output-encoding-in-user-format'
X-Git-Tag: v1.8.4-rc0~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a6482227ca31bd582aecbd211b85ff76595d0a7;p=git

Merge branch 'as/log-output-encoding-in-user-format'

"log --format=" did not honor i18n.logoutputencoding configuration
and this attempts to fix it.

* as/log-output-encoding-in-user-format:
  t4205 (log-pretty-formats): avoid using `sed`
  t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commitEncoding is not set
  t4205, t6006, t7102: make functions better readable
  t4205 (log-pretty-formats): revert back single quotes
  t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1
  t4205: replace .\+ with ..* in sed commands
  pretty: --format output should honor logOutputEncoding
  pretty: Add failing tests: --format output should honor logOutputEncoding
  t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
  t7102 (reset): don't hardcode SHA-1 in expected outputs
  t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
---

8a6482227ca31bd582aecbd211b85ff76595d0a7