diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-16 07:16:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 07:16:05 (GMT) |
| commit | 98f3f007f520de518c732c74085234dede144926 (patch) | |
| tree | 38aa575117222d8d91c60545f078b4a0cfebd87e /builtin | |
| parent | e366d0c6d04a5c29a8ef49c61bc28209f543f69a (diff) | |
| parent | 3e73cc62c0d80fedd1fc612e256b5eb3f3068de4 (diff) | |
| download | git-98f3f007f520de518c732c74085234dede144926.zip git-98f3f007f520de518c732c74085234dede144926.tar.gz git-98f3f007f520de518c732c74085234dede144926.tar.bz2 | |
Merge branch 'en/status-multiple-renames-to-the-same-target-fix'
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')
| -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 3f33ae6..1d5292e 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -874,6 +874,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"; |