summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2016-10-21 10:55:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-21 11:48:35 -0700
commitfdbf4510aeb7e7b860c2ee77b8a4a3c5787fe182 (patch)
tree63871e670950f601b23c73aafcb3ca259583b67a /t/t6023-merge-file.sh
parenttrailer: make args have their own struct (diff)
downloadtgif-fdbf4510aeb7e7b860c2ee77b8a4a3c5787fe182.tar.xz
trailer: clarify failure modes in parse_trailer
The parse_trailer function has a few modes of operation, all depending on whether the separator is present in its input, and if yes, the separator's position. Some of these modes are failure modes, and these failure modes are handled differently depending on whether the trailer line was sourced from a file or from a command-line argument. Extract a function to find the separator, allowing the invokers of parse_trailer to determine how to handle the failure modes instead of making parse_trailer do it. In this function, also take in the list of separators, so that we can distinguish between command line arguments (which allow '=' as separator) and file input (which does not allow '=' as separator). Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions