diff options
| author |  Jonathan Tan <jonathantanmy@google.com> | 2020-04-07 15:11:42 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-04-07 16:09:29 -0700 |
| commit | c14b6f83ec7453d2a93bba04f45caf26905f2bff (patch) | |
| tree | fa918791b1e3a7bbf0bc6836c134938ca4d53fdd /t/t6037-merge-ours-theirs.sh | |
| parent | diff: make diff_populate_filespec_options struct (diff) | |
| download | tgif-c14b6f83ec7453d2a93bba04f45caf26905f2bff.tar.xz | |
diff: refactor object read
Refactor the object reads in diff_populate_filespec() to have the first
object read not be in an if/else branch, because in a future patch, a
retry will be added to that first object read.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions