summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Eric Sunshine <sunshine@sunshineco.com>2013-08-09 17:39:54 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-13 09:08:58 -0700
commit9ae9ca1f95ccd3b4c1d62d856eb8b48fdff7c2d5 (patch)
tree139fda2f4b2dd14e14bef1c01b67343eaaad54d0 /git-merge-one-file.sh
parentline-range: reject -L line numbers less than 1 (diff)
downloadtgif-9ae9ca1f95ccd3b4c1d62d856eb8b48fdff7c2d5.tar.xz
contacts: validate hunk length earlier
Rather than calling get_blame() with a zero-length hunk only to have it rejected immediately, perform hunk-length validation earlier in order to avoid calling get_blame() unnecessarily. This is a preparatory step to simplify later patches which reduce the number of git-blame invocations by collecting together all lines to blame within a single file at a particular revision. By validating the blame range early, the subsequent patch can more easily avoid adding empty ranges at collection time. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions