diff options
| author |  Jonathan Tan <jonathantanmy@google.com> | 2018-10-18 13:43:27 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-19 12:04:53 +0900 |
| commit | 0b9333ff3ee172669dc3da51afa5fc0aa8e1b114 (patch) | |
| tree | dde1e323208d64f70274052ab402ba8b54462eb6 /builtin/merge-ours.c | |
| parent | Fourth batch for 2.20 (diff) | |
| download | tgif-0b9333ff3ee172669dc3da51afa5fc0aa8e1b114.tar.xz | |
upload-pack: make have_obj not global
Because upload_pack_v2() can be invoked multiple times in the same
process, the static variable have_obj may not be empty when it is
invoked. To make further analysis of this situation easier, make the
variable local; analysis will be done in a subsequent patch.
The new local variable in upload_pack_v2() is static to preserve
existing behavior; this is not necessary in upload_pack() because
upload_pack() is only invoked once per process.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions