diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-12 03:46:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-12 03:46:27 +0300 |
| commit | c21fdf3b60884222d5d28a09d854cef83c3e60ac (patch) | |
| tree | 607cc5260d49966c9e2dea0d504ed251b74c2608 /cache-tree.h | |
| parent | e0197c9aae39b0f1ba6c21d1f6d0bae5de03a44d (diff) | |
| parent | 45525bd022dda75ec935c9c579e452577dcfd31f (diff) | |
Merge branch 'jc/error-message-in-cherry-pick'
* jc/error-message-in-cherry-pick:
Make error messages from cherry-pick/revert more sensible
Diffstat (limited to 'cache-tree.h')
| -rw-r--r-- | cache-tree.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cache-tree.h b/cache-tree.h index 8243228e49..44aad426d3 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -30,4 +30,9 @@ int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int) struct cache_tree *cache_tree_find(struct cache_tree *, const char *); +#define WRITE_TREE_UNREADABLE_INDEX (-1) +#define WRITE_TREE_UNMERGED_INDEX (-2) +#define WRITE_TREE_PREFIX_ERROR (-3) + +int write_cache_as_tree(unsigned char *sha1, int missing_ok, const char *prefix); #endif |