]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a38d39a) | patch
merge: break out of all_strategy loop when strategy is found
authorSeija Kijin <doremylover123@gmail.com>
Mon, 9 Jan 2023 17:34:28 +0000 (17:34 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Jan 2023 18:24:57 +0000 (10:24 -0800)
commit0c75692ebcddb2443c5e56c68c2e0ed55dd1ae18
tree1ea1b801de8d3311b8cdf450ec7d8fa6818b5492tree
parenta38d39a4c50d1275833aba54c4dbdfce9e2e9ca1commit | diff
merge: break out of all_strategy loop when strategy is found

Once we find a match, there is no point to try finding the second
match in the inner loop.  Break out of the loop once we find the
first match.

Signed-off-by: Seija Kijin <doremylover123@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.