git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 93406a2)
rerere: only return whether a path has conflicts or not
authorThomas Gummerer <redacted>
Sun, 5 Aug 2018 17:20:33 +0000 (18:20 +0100)
committerJunio C Hamano <redacted>
Mon, 6 Aug 2018 20:22:35 +0000 (13:22 -0700)
commit221444f5d11a8fac84514447c2902430e237759c
tree02189a1dfe8fb7cb8925f55ad6b8fe17c13f3b9ctree | snapshot
parent93406a282f404fd9f736e96ae27cc6e2e5eb3cf1commit | diff
rerere: only return whether a path has conflicts or not

We currently return the exact number of conflict hunks a certain path
has from the 'handle_paths' function.  However all of its callers only
care whether there are conflicts or not or if there is an error.
Return only that information, and document that only that information
is returned.  This will simplify the code in the subsequent steps.

Signed-off-by: Thomas Gummerer <redacted>
Signed-off-by: Junio C Hamano <redacted>
rerere.c diff | blob | history
git clone https://git.99rst.org/PROJECT