summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-08-16 19:24:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-08-16 21:19:06 -0700
commita9ab2009dbbf769aadd52957950c1bad60a0c8fd (patch)
treeecd30e7b8c3e398695038858aff9db78433d4532 /merge-file.c
parentClarify actual behavior of 'git add' and ignored files (diff)
downloadtgif-a9ab2009dbbf769aadd52957950c1bad60a0c8fd.tar.xz
Clean-up read-tree error condition.
This is a follow-up to f34f2b0b; list_tree() function is where it first notices that the command line fed too many trees for us to handle, so move the error exit message to there, and raise the MAX_TREES to 8 (not that it matters very much in practice). Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions