diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:48 +0900 |
| commit | 254db3035ccf3413ab997c4baf2d3b8b7bb4c054 (patch) | |
| tree | 1e075b41ab27ffcf15fb5c30159a518f69ccb185 /builtin/commit.c | |
| parent | Merge branch 'jn/mailmap-update' into maint (diff) | |
| parent | commit: fix erroneous BUG, 'multiple renames on the same target? how?' (diff) | |
| download | tgif-254db3035ccf3413ab997c4baf2d3b8b7bb4c054.tar.xz | |
Merge branch 'en/status-multiple-renames-to-the-same-target-fix' into maint
The code in "git status" sometimes hit an assertion failure. This
was caused by a structure that was reused without cleaning the data
used for the first run, which has been corrected.
* en/status-multiple-renames-to-the-same-target-fix:
commit: fix erroneous BUG, 'multiple renames on the same target? how?'
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 0d9828e29e..83233ca1a5 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -872,6 +872,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, s->use_color = 0; commitable = run_status(s->fp, index_file, prefix, 1, s); s->use_color = saved_color_setting; + string_list_clear(&s->change, 1); } else { struct object_id oid; const char *parent = "HEAD"; |