reset: add test cases for "--keep" option

diff --git a/cache.h b/cache.h
index 4b15042c08afb2ba34ca6d08ebc5ca9b196ab7c8..b3370eb41e500b59bdf9d03679e7c17dde59e911 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -182,6 +182,8 @@ struct cache_entry {
 /* Only remove in work directory, not index */
 #define CE_WT_REMOVE (0x400000)
 
+#define CE_UNPACKED  (0x1000000)
+
 /*
  * Extended on-disk flags
  */
@@ -553,6 +555,7 @@ enum branch_track {
        BRANCH_TRACK_REMOTE,
        BRANCH_TRACK_ALWAYS,
        BRANCH_TRACK_EXPLICIT,
+       BRANCH_TRACK_OVERRIDE,
 };
 
 enum rebase_setup_type {