summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <stefanbeller@googlemail.com>2013-07-23 15:16:04 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-23 11:35:18 -0700
commit6a907786af835ac15962be53f1492f23e044f479 (patch)
tree587c4f9f125dfa1c5bd2dcacba089d3a22755c62 /Documentation/git-merge.txt
parentMerge branch 'mv/merge-ff-tristate' (diff)
downloadtgif-6a907786af835ac15962be53f1492f23e044f479.tar.xz
open_istream: remove unneeded check for null pointer
'st' is allocated via xmalloc a few lines before and passed to the stream opening functions. The xmalloc function is written in a way that either 'st' is allocated valid memory or xmalloc already dies. The function calls to open_istream_* do not change 'st', as the pointer is passed by reference and not a pointer of a pointer. Hence 'st' cannot be null at that part of the code. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions