projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 70cc3d3) | patch
merge-recursive: Split was_tracked() out of would_lose_untracked()
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:59 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:35 +0000 (14:19 -0700)
commitaacb82de3ff8ae7b0a9e4cfec16c1807b6c315ef
treef0d7c42d885f3eec2a693e110b8901f46f966491tree | snapshot
parent70cc3d36eba58f8bf177c91d82781fb727a9a4facommit | diff
merge-recursive: Split was_tracked() out of would_lose_untracked()

Checking whether a filename was part of stage 0 or stage 2 is code that we
would like to be able to call from a few other places without also
lstat()-ing the file to see if it exists in the working copy.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | history
Git—the stupid content tracker