wt-status.c: set commitable bit if there is a meaningful merge.

diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index be5e514324aba1d50d8afe653dd72ccc5db060d8..1a1eafa6fdc2e9dc66c98d3a81b7ee50e44727da 100644 (file)
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c
@@ -16,7 +16,7 @@ static int merge_entry(int pos, const char *path)
                die("git merge-index: %s not in the cache", path);
        found = 0;
        do {
-               struct cache_entry *ce = active_cache[pos];
+               const struct cache_entry *ce = active_cache[pos];
                int stage = ce_stage(ce);
 
                if (strcmp(ce->name, path))
@@ -58,7 +58,7 @@ static void merge_all(void)
 {
        int i;
        for (i = 0; i < active_nr; i++) {
-               struct cache_entry *ce = active_cache[i];
+               const struct cache_entry *ce = active_cache[i];
                if (!ce_stage(ce))
                        continue;
                i += merge_entry(i, ce->name)-1;
@@ -75,7 +75,7 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix)
        signal(SIGCHLD, SIG_DFL);
 
        if (argc < 3)
-               usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
+               usage("git merge-index [-o] [-q] <merge-program> (-a | [--] [<filename>...])");
 
        read_cache();