summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Erik Faye-Lund <kusmabite@googlemail.com>2010-03-21 15:40:16 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-21 11:44:27 -0700
commit1fb5fdd25f018480b48f6a74f06bad7e04866440 (patch)
tree7cf30b98f099f3d047dd2620c6f06085045df71d /contrib/examples/git-resolve.sh
parentUpdate draft release notes to 1.7.0.3 (diff)
downloadtgif-1fb5fdd25f018480b48f6a74f06bad7e04866440.tar.xz
rev-list: fix --pretty=oneline with empty message
55246aa (Dont use "<unknown>" for placeholders and suppress printing of empty user formats) introduced a check to prevent empty user-formats from being printed. This test didn't take empty commit messages into account, and prevented the line-termination from being output. This lead to multiple commits on a single line. Correct it by guarding the check with a check for user-format. A similar correction for the --graph code-path has been included. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions