From 08402b0409bc501deb97cf4388a78ee9f87092c6 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Wed, 11 Aug 2010 10:38:06 +0200 Subject: merge-recursive: distinguish "removed" and "overwritten" messages To limit the number of possible error messages, the error messages for the case would_lose_untracked_file and would_lose_orphaned in unpack_trees_options.msgs were handled with a single string, parameterized by an action string ("overwritten" or "removed"). Instead, we consider them as two different cases, with unparameterized string. This will make it easier to make separate lists sorted by error types later. Only the bind_overlap case still takes two %s parameters, but that's unavoidable. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- unpack-trees.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'unpack-trees.h') diff --git a/unpack-trees.h b/unpack-trees.h index 09e22522fb..8be6b3cca9 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -13,10 +13,12 @@ enum unpack_trees_error_types { ERROR_WOULD_OVERWRITE = 0, ERROR_NOT_UPTODATE_FILE, ERROR_NOT_UPTODATE_DIR, - ERROR_WOULD_LOSE_UNTRACKED, + ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, + ERROR_WOULD_LOSE_UNTRACKED_REMOVED, ERROR_BIND_OVERLAP, ERROR_SPARSE_NOT_UPTODATE_FILE, - ERROR_WOULD_LOSE_ORPHANED, + ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN, + ERROR_WOULD_LOSE_ORPHANED_REMOVED, NB_UNPACK_TREES_ERROR_TYPES }; -- cgit v1.2.3