diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-30 13:03:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 15:08:22 -0700 |
| commit | 8d9b5a4ada8b8e187af7dbdc7bc24f6ed774df80 (patch) | |
| tree | 6f052ca0461995b5a91e95f2de5b668f068b1216 /git-archimport.perl | |
| parent | rerere: handle conflicts with multiple stage #1 entries (diff) | |
| download | tgif-8d9b5a4ada8b8e187af7dbdc7bc24f6ed774df80.tar.xz | |
rerere: plug conflict ID leaks
The merge_rr string list stores the conflict ID (a hexadecimal
string that is used to index into $GIT_DIR/rr-cache) in the .util
field of its elements, and when do_plain_rerere() resolves a
conflict, the field is cleared. Also, when rerere_forget()
recomputes the conflict ID to updates the preimage file, the
conflict ID for the path is updated.
We forgot to free the existing conflict ID when we did these two
operations.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-archimport.perl')
0 files changed, 0 insertions, 0 deletions