summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2017-03-24 13:26:24 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-24 12:34:07 -0700
commit98718242cfd18f106dfcd7663282fb9906fd38a5 (patch)
treece6edc4110674db32066ad0ba81cc836db565c6b /Documentation/git-merge-file.txt
parentfast-import: use xsnprintf for writing sha1s (diff)
downloadtgif-98718242cfd18f106dfcd7663282fb9906fd38a5.tar.xz
fast-import: use xsnprintf for formatting headers
The stream_blob() function checks the return value of snprintf and dies. This is more simply done with xsnprintf (and matches the similar call in store_object). The message the user would get is less specific, but since the point is that this _shouldn't_ ever happen, that's OK. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions