From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Nov 2007 22:03:50 +0000 (-0800)
Subject: Merge branch 'rs/pretty'
X-Git-Tag: v1.5.4-rc0~213
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=37ec2b4c26901d5f1ca19948189dc2b6f21523d5;p=git.git

Merge branch 'rs/pretty'

* rs/pretty:
  Fix preprocessor logic that determines the availablity of strchrnul().
  Simplify strchrnul() compat code
  --format=pretty: avoid calculating expensive expansions twice
  add strbuf_adddup()
  --pretty=format: parse commit message only once
  --pretty=format: on-demand format expansion
  Add strchrnul()
---

37ec2b4c26901d5f1ca19948189dc2b6f21523d5