summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-07-27 20:00:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-07-27 20:00:27 (GMT)
commit494d31e9d6c7e6e40f53e06ae6909f00c4b5fb01 (patch)
treeade8705e0dfd567e6f109d3e29d3985f54e01484
parent57fe0df8a6295bc633f9fc4d2fa941900d9c109e (diff)
parent04393ae7f7951ba8af982cd1943c4dfb3102f6ed (diff)
downloadgit-494d31e9d6c7e6e40f53e06ae6909f00c4b5fb01.zip
git-494d31e9d6c7e6e40f53e06ae6909f00c4b5fb01.tar.gz
git-494d31e9d6c7e6e40f53e06ae6909f00c4b5fb01.tar.bz2
Merge branch 'jk/diff-files-cleanup-fix' into maint
An earlier attempt to plug leaks placed a clean-up label to jump to at a bogus place, which as been corrected. source: <Ys0c0ePxPOqZ/5ck@coredump.intra.peff.net> * jk/diff-files-cleanup-fix: diff-files: move misplaced cleanup label
-rw-r--r--builtin/diff-files.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 2bfaf9b..92cf6e1 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -80,9 +80,9 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
result = -1;
goto cleanup;
}
-cleanup:
result = run_diff_files(&rev, options);
result = diff_result_code(&rev.diffopt, result);
+cleanup:
release_revisions(&rev);
return result;
}