Submodules: Use "ignore" settings from .gitmodules too for diff and status

diff --git a/server-info.c b/server-info.c
index d096dc7718b21eb7f5e88b7276983ca6cccc723e..9ec744e9f2da294a21ac02b46f0ea0b35889ae54 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -113,11 +113,8 @@ static int read_pack_info_file(const char *infofile)
                                goto out_stale;
                        break;
                case 'D': /* we used to emit D but that was misguided. */
-                       goto out_stale;
-                       break;
                case 'T': /* we used to emit T but nobody uses it. */
                        goto out_stale;
-                       break;
                default:
                        error("unrecognized: %s", line);
                        break;
@@ -132,8 +129,8 @@ static int read_pack_info_file(const char *infofile)
 
 static int compare_info(const void *a_, const void *b_)
 {
-       struct pack_info * const* a = a_;
-       struct pack_info * const* b = b_;
+       struct pack_info *const *a = a_;
+       struct pack_info *const *b = b_;
 
        if (0 <= (*a)->old_num && 0 <= (*b)->old_num)
                /* Keep the order in the original */