summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2014-10-07 15:16:57 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-14 11:01:05 -0700
commit8852117a603c5ed5131233a80453db37c0958871 (patch)
tree62d269e6d9685336fe675ddba629006bcb774da7 /mergetools/vimdiff
parentGit 2.1.2 (diff)
downloadtgif-8852117a603c5ed5131233a80453db37c0958871.tar.xz
pass config slots as pointers instead of offsets
Many config-parsing helpers, like parse_branch_color_slot, take the name of a config variable and an offset to the "slot" name (e.g., "color.branch.plain" is passed along with "13" to effectively pass "plain"). This is leftover from the time that these functions would die() on error, and would want the full variable name for error reporting. These days they do not use the full variable name at all. Passing a single pointer to the slot name is more natural, and lets us more easily adjust the callers to use skip_prefix to avoid manually writing offset numbers. This is effectively a continuation of 9e1a5eb, which did the same for parse_diff_color_slot. This patch covers all of the remaining similar constructs. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions