Merge branch 'ab/pager-exit-log'

[thirdparty/git.git] / fsck.c

diff --git a/fsck.c b/fsck.c
index 4b7f0b73d73c3aec8342b9bcb4023ec6f0d300a0..71134fdefaa561ced0cfa3659eaa34155e9be5ce 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -463,6 +463,11 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
                                generation += power * (name[--len] - '0');
                        if (power > 1 && len && name[len - 1] == '~')
                                name_prefix_len = len - 1;
+                       else {
+                               /* Maybe a non-first parent, e.g. HEAD^2 */
+                               generation = 0;
+                               name_prefix_len = len;
+                       }
                }
        }