merge: use return value of resolve_ref() to determine if HEAD is invalid

diff --git a/unpack-trees.h b/unpack-trees.h
index cd11a08365ab3e27b1321b3df87bcab6b9278f90..64f02cb03ab242ac08ea0f1afbb24e71cf6664aa 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -46,7 +46,8 @@ struct unpack_trees_options {
                     debug_unpack,
                     skip_sparse_checkout,
                     gently,
-                    show_all_errors;
+                    show_all_errors,
+                    dry_run;
        const char *prefix;
        int cache_bottom;
        struct dir_struct *dir;