projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 813ebf8) | patch
apply: move "already exists" logic to check_to_create()
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Jun 2012 21:10:19 +0000 (14:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2012 21:36:51 +0000 (14:36 -0700)
commitec15be02679ed5a98e4a96b23b99dd1b90196fae
tree5a2bc6b24a2a7879c80673feabaa21e21a69ba5ctree | snapshot
parent813ebf82215ce3e07631ea7ab12b30c609adcccdcommit | diff
apply: move "already exists" logic to check_to_create()

The check_to_create_blob() function used to check only the case
where we are applying to the working tree.  Rename the function to
check_to_create() and make it also responsible for checking the case
where we apply to the index.  Also make its caller responsible for
issuing an error message.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/apply.c diff | blob | history
Git—the stupid content tracker