summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2019-02-04 00:06:50 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-02-04 13:33:32 -0800
commit23311f35424705f11acf80685bac1fe27e36192f (patch)
tree120db1425a830fad7099a85099c34a1ecfc8784f /Documentation/git-mergetool.txt
parentFourth batch after 2.20 (diff)
downloadtgif-23311f35424705f11acf80685bac1fe27e36192f.tar.xz
fetch-pack: clear alternate shallow when complete
When we write an alternate shallow file in update_shallow, we write it into the lock file. The string stored in alternate_shallow_file is copied from the lock file path, but it is freed the moment that the lock file is closed, since we call strbuf_release to free that path. This used to work, since we did not invoke git index-pack more than once, but now that we do, we reuse the freed memory. Ensure we reset the value to NULL to avoid using freed memory. git index-pack will read the repository's shallow file, which will have been updated with the correct information. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions