From d39cc7185e0c1529917c0407036c9b09a94dd5ee Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 5 Sep 2024 23:47:08 -0400 Subject: [PATCH] sparse-checkout: consolidate cleanup when writing patterns In write_patterns_and_update(), we always need to free the pattern list before exiting the function. Rather than handling it manually when we return early, we can jump to an "out" label where cleanup happens. This let us drop one line, but also establishes a pattern we can use for other cleanup. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/sparse-checkout.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c index 2604ab04df..dfefe609a1 100644 --- a/builtin/sparse-checkout.c +++ b/builtin/sparse-checkout.c @@ -343,9 +343,8 @@ static int write_patterns_and_update(struct pattern_list *pl) result = update_working_directory(pl); if (result) { rollback_lock_file(&lk); - clear_pattern_list(pl); update_working_directory(NULL); - return result; + goto out; } fp = xfdopen(fd, "w"); @@ -358,9 +357,9 @@ static int write_patterns_and_update(struct pattern_list *pl) fflush(fp); commit_lock_file(&lk); +out: clear_pattern_list(pl); - - return 0; + return result; } enum sparse_checkout_mode {