{"thread":{"id":"58446","subject":"[PATCH] fuzz: reorganise the path for existing oss-fuzz fuzzers","startedAt":"2022-09-16T19:03:40Z","lastAt":"2022-09-19T16:40:58Z","messageCount":9,"participants":["Arthur Chan via GitGitGadget","Junio C Hamano","Arthur Chan","Ævar Arnfjörð Bjarmason"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"463099","messageId":"pull.1353.git.1663355009333.gitgitgadget@gmail.com","threadId":"58446","inReplyTo":null,"subject":"[PATCH] fuzz: reorganise the path for existing oss-fuzz fuzzers","fromName":"Arthur Chan via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-09-16T19:03:29Z","receivedAt":"2022-09-16T19:03:40Z","isPatch":true,"sender":{"key":"arthur.chan@adalogics.com","avatar":"https://avatars.githubusercontent.com/u/33429318?v=4"},"body":"From: Arthur Chan \n\nThis patch is aimed to provide a better organisation for oss-fuzz\nfuzzers, allowing more fuzzers for the git project to be added\nin a later development.\n\nA new folder oss-fuzz has been created and existing fuzzers are\nmoved into the new folders. Makefile has been fixed accordingly.\n\nCC: Josh Steadmon \nCC: David Korczynski \nSigned-off-by: Arthur Chan \n---\n fuzz: reorganise the path for existing oss-fuzz fuzzers\n \n This patch is aimed to provide a better organisation for oss-fuzz\n fuzzers, allowing more fuzzers for the git project to be added in a\n later development.\n \n A new folder oss-fuzz has been created and existing fuzzers are moved\n into the new folders. Makefile has been fixed accordingly.\n \n CC: Josh Steadmon steadmon@google.com CC: David Korczynski\n david@adalogics.com Signed-off-by: Arthur Chan arthur.chan@adalogics.com\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1353%2Farthurscchan%2Frelocate-fuzzer-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1353/arthurscchan/relocate-fuzzer-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1353\n\n Makefile | 6 +++---\n fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c | 0\n fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c | 0\n fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c | 0\n 4 files changed, 3 insertions(+), 3 deletions(-)\n rename fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c (100%)\n rename fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c (100%)\n rename fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c (100%)\n\ndiff --git a/Makefile b/Makefile\nindex d9247ead45b..2d56aae7a1d 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -686,9 +686,9 @@ SCRIPTS = $(SCRIPT_SH_GEN) \\\n \n ETAGS_TARGET = TAGS\n \n-FUZZ_OBJS += fuzz-commit-graph.o\n-FUZZ_OBJS += fuzz-pack-headers.o\n-FUZZ_OBJS += fuzz-pack-idx.o\n+FUZZ_OBJS += oss-fuzz/fuzz-commit-graph.o\n+FUZZ_OBJS += oss-fuzz/fuzz-pack-headers.o\n+FUZZ_OBJS += oss-fuzz/fuzz-pack-idx.o\n .PHONY: fuzz-objs\n fuzz-objs: $(FUZZ_OBJS)\n \ndiff --git a/fuzz-commit-graph.c b/oss-fuzz/fuzz-commit-graph.c\nsimilarity index 100%\nrename from fuzz-commit-graph.c\nrename to oss-fuzz/fuzz-commit-graph.c\ndiff --git a/fuzz-pack-headers.c b/oss-fuzz/fuzz-pack-headers.c\nsimilarity index 100%\nrename from fuzz-pack-headers.c\nrename to oss-fuzz/fuzz-pack-headers.c\ndiff --git a/fuzz-pack-idx.c b/oss-fuzz/fuzz-pack-idx.c\nsimilarity index 100%\nrename from fuzz-pack-idx.c\nrename to oss-fuzz/fuzz-pack-idx.c\n\nbase-commit: d3fa443f97e3a8d75b51341e2d5bac380b7422df\n-- \ngitgitgadget\n"},{"id":"463115","messageId":"xmqqo7vff0gi.fsf@gitster.g","threadId":"58446","inReplyTo":"pull.1353.git.1663355009333.gitgitgadget@gmail.com","subject":"Re: [PATCH] fuzz: reorganise the path for existing oss-fuzz fuzzers","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-09-16T21:55:57Z","receivedAt":"2022-09-16T21:56:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Arthur Chan via GitGitGadget\" writes:\n\n> From: Arthur Chan \n>\n> This patch is aimed to provide a better organisation for oss-fuzz\n> fuzzers, allowing more fuzzers for the git project to be added\n> in a later development.\n>\n> A new folder oss-fuzz has been created and existing fuzzers are\n> moved into the new folders. Makefile has been fixed accordingly.\n\n\"folder\" -> \"directory\" everywhere.\n\n> Makefile | 6 +++---\n> fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c | 0\n> fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c | 0\n> fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c | 0\n> 4 files changed, 3 insertions(+), 3 deletions(-)\n> rename fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c (100%)\n> rename fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c (100%)\n> rename fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c (100%)\n\nIt is curious that we do not have any changes to .gitignore\npatterns.\n\n $ git grep fuzz .gitignore Makefile\n .gitignore:/fuzz-commit-graph\n .gitignore:/fuzz_corpora\n .gitignore:/fuzz-pack-headers\n .gitignore:/fuzz-pack-idx\n Makefile:FUZZ_OBJS += fuzz-commit-graph.o\n Makefile:FUZZ_OBJS += fuzz-pack-headers.o\n Makefile:FUZZ_OBJS += fuzz-pack-idx.o\n Makefile:.PHONY: fuzz-objs\n Makefile:fuzz-objs: $(FUZZ_OBJS)\n Makefile:# Always build fuzz objects even if not testing, to prevent bit-rot.\n Makefile:# Building fuzz targets generally requires a special set of compiler flags that\n Makefile:# CFLAGS=\"-fsanitize=fuzzer-no-link,address\" \\\n Makefile:# LIB_FUZZING_ENGINE=\"-fsanitize=fuzzer\" \\\n Makefile:# fuzz-all\n Makefile:.PHONY: fuzz-all\n Makefile:fuzz-all: $(FUZZ_PROGRAMS)\n\nI do not know what \"fuzz_corpora\" is, which step in build creates\nit, and why we do not have to bother removing it in \"make clean\",\nthe last of which is not the fault of this patch, but I suspect that\nat least other three existing entries that name $(FUZZ_PROGRAMS)\nneed to be updated, because ...\n\n> diff --git a/Makefile b/Makefile\n> index d9247ead45b..2d56aae7a1d 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -686,9 +686,9 @@ SCRIPTS = $(SCRIPT_SH_GEN) \\\n> \n> ETAGS_TARGET = TAGS\n> \n> -FUZZ_OBJS += fuzz-commit-graph.o\n> -FUZZ_OBJS += fuzz-pack-headers.o\n> -FUZZ_OBJS += fuzz-pack-idx.o\n> +FUZZ_OBJS += oss-fuzz/fuzz-commit-graph.o\n> +FUZZ_OBJS += oss-fuzz/fuzz-pack-headers.o\n> +FUZZ_OBJS += oss-fuzz/fuzz-pack-idx.o\n\n... FUZZ_OBJS now live in the oss-fuzz/ directory, and Makefile has\n\n FUZZ_PROGRAMS += $(patsubst %.o,%,$(FUZZ_OBJS))\n\n $(FUZZ_PROGRAMS): all\n\t$(QUIET_LINK)$(CXX) $(FUZZ_CXXFLAGS) $(LIB_OBJS) $(BUILTIN_OBJS) \\\n\t\t$(XDIFF_OBJS) $(EXTLIBS) git.o $@.o $(LIB_FUZZING_ENGINE) -o $@\n\nneither of which has been touched by the patch, so presumably the\nexecutables are now created in the oss-fuzz/ directory as well, and\nthey are what .gitignore should be listing, right?\n\nAlso, compiling the exectuable files would not be the end of the\nstory, right? Do folks (like test script, makefile targets and CI\nrecipes) who used to run ./fuzz-commit-graph need to be told that\nthey now need to run oss-fuzz/fuzz-commit-graph instead? They may\nnot be inside my tree, but what's the best way to inform them? Add\nentries to release notes (not asking you to add one immediately ---\nasking you to help formulating the plans).\n\nThanks.\n"},{"id":"463123","messageId":"2405897f-a774-e0d3-99bb-2185dcbb5432@adalogics.com","threadId":"58446","inReplyTo":"xmqqo7vff0gi.fsf@gitster.g","subject":"Re: [PATCH] fuzz: reorganise the path for existing oss-fuzz fuzzers","fromName":"Arthur Chan","fromEmail":"arthur.chan@adalogics.com","sentAt":"2022-09-17T00:45:12Z","receivedAt":"2022-09-17T00:46:26Z","isPatch":true,"sender":{"key":"arthur.chan@adalogics.com","avatar":"https://avatars.githubusercontent.com/u/33429318?v=4"},"body":"\nOn 16/9/2022 10:55 pm, Junio C Hamano wrote:\n> \"Arthur Chan via GitGitGadget\" writes:\n>\n>> From: Arthur Chan \n>>\n>> This patch is aimed to provide a better organisation for oss-fuzz\n>> fuzzers, allowing more fuzzers for the git project to be added\n>> in a later development.\n>>\n>> A new folder oss-fuzz has been created and existing fuzzers are\n>> moved into the new folders. Makefile has been fixed accordingly.\n> \"folder\" -> \"directory\" everywhere.\nThanks for the suggestion. I will change it in v2.\n>> Makefile | 6 +++---\n>> fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c | 0\n>> fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c | 0\n>> fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c | 0\n>> 4 files changed, 3 insertions(+), 3 deletions(-)\n>> rename fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c (100%)\n>> rename fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c (100%)\n>> rename fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c (100%)\n> It is curious that we do not have any changes to .gitignore\n> patterns.\n>\n> $ git grep fuzz .gitignore Makefile\n> .gitignore:/fuzz-commit-graph\n> .gitignore:/fuzz_corpora\n> .gitignore:/fuzz-pack-headers\n> .gitignore:/fuzz-pack-idx\n> Makefile:FUZZ_OBJS += fuzz-commit-graph.o\n> Makefile:FUZZ_OBJS += fuzz-pack-headers.o\n> Makefile:FUZZ_OBJS += fuzz-pack-idx.o\n> Makefile:.PHONY: fuzz-objs\n> Makefile:fuzz-objs: $(FUZZ_OBJS)\n> Makefile:# Always build fuzz objects even if not testing, to prevent bit-rot.\n> Makefile:# Building fuzz targets generally requires a special set of compiler flags that\n> Makefile:# CFLAGS=\"-fsanitize=fuzzer-no-link,address\" \\\n> Makefile:# LIB_FUZZING_ENGINE=\"-fsanitize=fuzzer\" \\\n> Makefile:# fuzz-all\n> Makefile:.PHONY: fuzz-all\n> Makefile:fuzz-all: $(FUZZ_PROGRAMS)\n>\n> I do not know what \"fuzz_corpora\" is, which step in build creates\n> it, and why we do not have to bother removing it in \"make clean\",\n> the last of which is not the fault of this patch, but I suspect that\n> at least other three existing entries that name $(FUZZ_PROGRAMS)\n> need to be updated, because ...\n\nI also have no idea what fuzz_corpora is, I will ask the person who\nwrote the three fuzzers to see if he got any idea.\n\nAnd yes, indeed, I miss the change in .gitignore, I will modify it and\npush it to v2.\n\n>> diff --git a/Makefile b/Makefile\n>> index d9247ead45b..2d56aae7a1d 100644\n>> --- a/Makefile\n>> +++ b/Makefile\n>> @@ -686,9 +686,9 @@ SCRIPTS = $(SCRIPT_SH_GEN) \\\n>>\n>> ETAGS_TARGET = TAGS\n>>\n>> -FUZZ_OBJS += fuzz-commit-graph.o\n>> -FUZZ_OBJS += fuzz-pack-headers.o\n>> -FUZZ_OBJS += fuzz-pack-idx.o\n>> +FUZZ_OBJS += oss-fuzz/fuzz-commit-graph.o\n>> +FUZZ_OBJS += oss-fuzz/fuzz-pack-headers.o\n>> +FUZZ_OBJS += oss-fuzz/fuzz-pack-idx.o\n> ... FUZZ_OBJS now live in the oss-fuzz/ directory, and Makefile has\n>\n> FUZZ_PROGRAMS += $(patsubst %.o,%,$(FUZZ_OBJS))\n>\n> $(FUZZ_PROGRAMS): all\n> $(QUIET_LINK)$(CXX) $(FUZZ_CXXFLAGS) $(LIB_OBJS) $(BUILTIN_OBJS) \\\n> $(XDIFF_OBJS) $(EXTLIBS) git.o $@.o $(LIB_FUZZING_ENGINE) -o $@\n>\n> neither of which has been touched by the patch, so presumably the\n> executables are now created in the oss-fuzz/ directory as well, and\n> they are what .gitignore should be listing, right?\nYes, indeed. sorry for missing out the changes in .gitignore. I will\nmodify it and push it to v2\n>\n> Also, compiling the exectuable files would not be the end of the\n> story, right? Do folks (like test script, makefile targets and CI\n> recipes) who used to run ./fuzz-commit-graph need to be told that\n> they now need to run oss-fuzz/fuzz-commit-graph instead? They may\n> not be inside my tree, but what's the best way to inform them? Add\n> entries to release notes (not asking you to add one immediately ---\n> asking you to help formulating the plans).\n\nIn general, for the oss-fuzz project, there will be a dockerfile and\nbuild script prepared for each of the target project. The Dockerfile\nwill pull out the target version of the the target project, setting them\nup for the build script. Then the build script will compile the target\nproject together with the fuzzers. After that it will move the compiled\nfuzzer into correct location for the oss-fuzz library to grab them and\nstart the fuzzing process. The fuzzing and execution of those fuzzers\nare all on the oss-fuzz side. We are just trying to push fuzzers to the\ngit upstream in order to allow it to compile and sync with the git\nrepository which the fuzzers depending on. This is the existing\nexecution plan for those fuzzers as far as I know. We are actually in\noffline discussion with the person who create that three fuzzers and we\nagree to go on this route. For your reference, you could find the\ndockerfile and build script of the oss-fuzz for the git repository in\nhttps://github.com/google/oss-fuzz/tree/master/projects/git. We will of\ncourse need to update the build script on the oss-fuzz tree in order to\nallow oss-fuzz to retrieve the fuzzers after it has been reloacted. But\nthis won't affect the git tree.\n\nThanks again for pointing out my careless mistake on .gitignore. I will\nfix that together with the comment and push a v2. Thanks very much for\nyour time. Cheers\n\n> Thanks.\n> ADA Logics Ltd is registered in England. No: 11624074.\n> Registered office: 266 Banbury Road, Post Box 292,\n> OX2 7DL, Oxford, Oxfordshire , United Kingdom\nADA Logics Ltd is registered in England. No: 11624074.\nRegistered office: 266 Banbury Road, Post Box 292,\nOX2 7DL, Oxford, Oxfordshire , United Kingdom\n"},{"id":"463145","messageId":"pull.1353.v2.git.1663457311149.gitgitgadget@gmail.com","threadId":"58446","inReplyTo":"pull.1353.git.1663355009333.gitgitgadget@gmail.com","subject":"[PATCH v2] fuzz: reorganise the path for existing oss-fuzz fuzzers","fromName":"Arthur Chan via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-09-17T23:28:30Z","receivedAt":"2022-09-17T23:28:38Z","isPatch":true,"sender":{"key":"arthur.chan@adalogics.com","avatar":"https://avatars.githubusercontent.com/u/33429318?v=4"},"body":"From: Arthur Chan \n\nThis patch is aimed to provide a better organisation for oss-fuzz\nfuzzers, allowing more fuzzers for the git project to be added\nin later development.\n\nA new direrctory oss-fuzz has been created and existing fuzzers are\nmoved into the new directory. Makefile and .gitignore have been\nfixed accordingly.\n\nCC: Josh Steadmon \nCC: David Korczynski \nSigned-off-by: Arthur Chan \n---\n fuzz: reorganise the path for existing oss-fuzz fuzzers\n \n This patch is aimed to provide a better organisation for oss-fuzz\n fuzzers, allowing more fuzzers for the git project to be added in later\n development.\n \n A new directory oss-fuzz has been created and existing fuzzers are moved\n into the new directory. Makefile and .gitignore have been fixed\n accordingly.\n \n CC: Josh Steadmon steadmon@google.com CC: David Korczynski\n david@adalogics.com Signed-off-by: Arthur Chan arthur.chan@adalogics.com\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1353%2Farthurscchan%2Frelocate-fuzzer-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1353/arthurscchan/relocate-fuzzer-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/1353\n\nRange-diff vs v1:\n\n 1: 1cc90522b7b ! 1: c056429897a fuzz: reorganise the path for existing oss-fuzz fuzzers\n @@ Commit message\n \n This patch is aimed to provide a better organisation for oss-fuzz\n fuzzers, allowing more fuzzers for the git project to be added\n - in a later development.\n + in later development.\n \n - A new folder oss-fuzz has been created and existing fuzzers are\n - moved into the new folders. Makefile has been fixed accordingly.\n + A new direrctory oss-fuzz has been created and existing fuzzers are\n + moved into the new directory. Makefile and .gitignore have been\n + fixed accordingly.\n \n CC: Josh Steadmon \n CC: David Korczynski \n Signed-off-by: Arthur Chan \n \n + ## .gitignore ##\n +@@\n +-/fuzz-commit-graph\n +-/fuzz_corpora\n +-/fuzz-pack-headers\n ++/oss-fuzz/fuzz-commit-graph\n ++/oss-fuzz/fuzz_corpora\n ++/oss-fuzz/fuzz-pack-headers\n + /fuzz-pack-idx\n + /GIT-BUILD-OPTIONS\n + /GIT-CFLAGS\n +\n ## Makefile ##\n @@ Makefile: SCRIPTS = $(SCRIPT_SH_GEN) \\\n \n\n\n .gitignore | 6 +++---\n Makefile | 6 +++---\n fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c | 0\n fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c | 0\n fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c | 0\n 5 files changed, 6 insertions(+), 6 deletions(-)\n rename fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c (100%)\n rename fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c (100%)\n rename fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c (100%)\n\ndiff --git a/.gitignore b/.gitignore\nindex 80b530bbed2..9e810c07ba9 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -1,6 +1,6 @@\n-/fuzz-commit-graph\n-/fuzz_corpora\n-/fuzz-pack-headers\n+/oss-fuzz/fuzz-commit-graph\n+/oss-fuzz/fuzz_corpora\n+/oss-fuzz/fuzz-pack-headers\n /fuzz-pack-idx\n /GIT-BUILD-OPTIONS\n /GIT-CFLAGS\ndiff --git a/Makefile b/Makefile\nindex d9247ead45b..2d56aae7a1d 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -686,9 +686,9 @@ SCRIPTS = $(SCRIPT_SH_GEN) \\\n \n ETAGS_TARGET = TAGS\n \n-FUZZ_OBJS += fuzz-commit-graph.o\n-FUZZ_OBJS += fuzz-pack-headers.o\n-FUZZ_OBJS += fuzz-pack-idx.o\n+FUZZ_OBJS += oss-fuzz/fuzz-commit-graph.o\n+FUZZ_OBJS += oss-fuzz/fuzz-pack-headers.o\n+FUZZ_OBJS += oss-fuzz/fuzz-pack-idx.o\n .PHONY: fuzz-objs\n fuzz-objs: $(FUZZ_OBJS)\n \ndiff --git a/fuzz-commit-graph.c b/oss-fuzz/fuzz-commit-graph.c\nsimilarity index 100%\nrename from fuzz-commit-graph.c\nrename to oss-fuzz/fuzz-commit-graph.c\ndiff --git a/fuzz-pack-headers.c b/oss-fuzz/fuzz-pack-headers.c\nsimilarity index 100%\nrename from fuzz-pack-headers.c\nrename to oss-fuzz/fuzz-pack-headers.c\ndiff --git a/fuzz-pack-idx.c b/oss-fuzz/fuzz-pack-idx.c\nsimilarity index 100%\nrename from fuzz-pack-idx.c\nrename to oss-fuzz/fuzz-pack-idx.c\n\nbase-commit: d3fa443f97e3a8d75b51341e2d5bac380b7422df\n-- \ngitgitgadget\n"},{"id":"463159","messageId":"pull.1353.v3.git.1663542495094.gitgitgadget@gmail.com","threadId":"58446","inReplyTo":"pull.1353.v2.git.1663457311149.gitgitgadget@gmail.com","subject":"[PATCH v3] fuzz: reorganise the path for existing oss-fuzz fuzzers","fromName":"Arthur Chan via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-09-18T23:08:14Z","receivedAt":"2022-09-18T23:08:25Z","isPatch":true,"sender":{"key":"arthur.chan@adalogics.com","avatar":"https://avatars.githubusercontent.com/u/33429318?v=4"},"body":"From: Arthur Chan \n\nThis patch is aimed to provide a better organisation for oss-fuzz\nfuzzers, allowing more fuzzers for the git project to be added\nin later development.\n\nA new direrctory oss-fuzz has been created and existing fuzzers are\nmoved into the new directory. Makefile and .gitignore have been\nfixed accordingly.\n\nCC: Josh Steadmon \nCC: David Korczynski \nSigned-off-by: Arthur Chan \n---\n fuzz: reorganise the path for existing oss-fuzz fuzzers\n \n This patch is aimed to provide a better organisation for oss-fuzz\n fuzzers, allowing more fuzzers for the git project to be added in later\n development.\n \n A new directory oss-fuzz has been created and existing fuzzers are moved\n into the new directory. Makefile and .gitignore have been fixed\n accordingly.\n \n Fix wrong push for v2\n \n CC: Josh Steadmon steadmon@google.com CC: David Korczynski\n david@adalogics.com Signed-off-by: Arthur Chan arthur.chan@adalogics.com\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1353%2Farthurscchan%2Frelocate-fuzzer-v3\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1353/arthurscchan/relocate-fuzzer-v3\nPull-Request: https://github.com/gitgitgadget/git/pull/1353\n\nRange-diff vs v2:\n\n 1: c056429897a ! 1: 21714e583aa fuzz: reorganise the path for existing oss-fuzz fuzzers\n @@ Commit message\n ## .gitignore ##\n @@\n -/fuzz-commit-graph\n --/fuzz_corpora\n --/fuzz-pack-headers\n +/oss-fuzz/fuzz-commit-graph\n -+/oss-fuzz/fuzz_corpora\n + /fuzz_corpora\n +-/fuzz-pack-headers\n +-/fuzz-pack-idx\n +/oss-fuzz/fuzz-pack-headers\n - /fuzz-pack-idx\n ++/oss-fuzz/fuzz-pack-idx\n /GIT-BUILD-OPTIONS\n /GIT-CFLAGS\n + /GIT-LDFLAGS\n \n ## Makefile ##\n @@ Makefile: SCRIPTS = $(SCRIPT_SH_GEN) \\\n\n\n .gitignore | 6 +++---\n Makefile | 6 +++---\n fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c | 0\n fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c | 0\n fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c | 0\n 5 files changed, 6 insertions(+), 6 deletions(-)\n rename fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c (100%)\n rename fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c (100%)\n rename fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c (100%)\n\ndiff --git a/.gitignore b/.gitignore\nindex 80b530bbed2..d11fa8297d2 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -1,7 +1,7 @@\n-/fuzz-commit-graph\n+/oss-fuzz/fuzz-commit-graph\n /fuzz_corpora\n-/fuzz-pack-headers\n-/fuzz-pack-idx\n+/oss-fuzz/fuzz-pack-headers\n+/oss-fuzz/fuzz-pack-idx\n /GIT-BUILD-OPTIONS\n /GIT-CFLAGS\n /GIT-LDFLAGS\ndiff --git a/Makefile b/Makefile\nindex d9247ead45b..2d56aae7a1d 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -686,9 +686,9 @@ SCRIPTS = $(SCRIPT_SH_GEN) \\\n \n ETAGS_TARGET = TAGS\n \n-FUZZ_OBJS += fuzz-commit-graph.o\n-FUZZ_OBJS += fuzz-pack-headers.o\n-FUZZ_OBJS += fuzz-pack-idx.o\n+FUZZ_OBJS += oss-fuzz/fuzz-commit-graph.o\n+FUZZ_OBJS += oss-fuzz/fuzz-pack-headers.o\n+FUZZ_OBJS += oss-fuzz/fuzz-pack-idx.o\n .PHONY: fuzz-objs\n fuzz-objs: $(FUZZ_OBJS)\n \ndiff --git a/fuzz-commit-graph.c b/oss-fuzz/fuzz-commit-graph.c\nsimilarity index 100%\nrename from fuzz-commit-graph.c\nrename to oss-fuzz/fuzz-commit-graph.c\ndiff --git a/fuzz-pack-headers.c b/oss-fuzz/fuzz-pack-headers.c\nsimilarity index 100%\nrename from fuzz-pack-headers.c\nrename to oss-fuzz/fuzz-pack-headers.c\ndiff --git a/fuzz-pack-idx.c b/oss-fuzz/fuzz-pack-idx.c\nsimilarity index 100%\nrename from fuzz-pack-idx.c\nrename to oss-fuzz/fuzz-pack-idx.c\n\nbase-commit: d3fa443f97e3a8d75b51341e2d5bac380b7422df\n-- \ngitgitgadget\n"},{"id":"463169","messageId":"220919.86r10762bg.gmgdl@evledraar.gmail.com","threadId":"58446","inReplyTo":"pull.1353.v3.git.1663542495094.gitgitgadget@gmail.com","subject":"Re: [PATCH v3] fuzz: reorganise the path for existing oss-fuzz fuzzers","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-09-19T11:10:04Z","receivedAt":"2022-09-19T11:17:30Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Sun, Sep 18 2022, Arthur Chan via GitGitGadget wrote:\n\n> From: Arthur Chan \n>\n> This patch is aimed to provide a better organisation for oss-fuzz\n> fuzzers, allowing more fuzzers for the git project to be added\n> in later development.\n\nI don't see any problem with this change per-se, but this rationale\nreally doesn't explain anything in the end to the reader. How does just\nhaving x/y-*.c files rather than x-y-*.c allow for more fuzzers to be\nadded? We could also add new fuzzers to the top-level now, why does this\nchange help us to do so.\n\nI suspect the unstated reason is just \"adding a lot more would make the\ntop-level cluttered\", or perhaps some design reason you hinted at in\nhttps://lore.kernel.org/git/2405897f-a774-e0d3-99bb-2185dcbb5432@adalogics.com/\n(but I haven't taken the time to fully understand).\n\nSo, I'm fine with this v3 as-is, but also wouldn't mind a v4 with an\nupdated commit message to address the above confusion.\n\n> --- a/.gitignore\n> +++ b/.gitignore\n> @@ -1,7 +1,7 @@\n> -/fuzz-commit-graph\n> +/oss-fuzz/fuzz-commit-graph\n> /fuzz_corpora\n> -/fuzz-pack-headers\n> -/fuzz-pack-idx\n> +/oss-fuzz/fuzz-pack-headers\n> +/oss-fuzz/fuzz-pack-idx\n> /GIT-BUILD-OPTIONS\n> /GIT-CFLAGS\n> /GIT-LDFLAGS\n\nSpeaking of clutter, a much better change here IMO would be to create a\n/oss-fuzz/.gitignore file, and then move these there. For prior art see:\n\n\tgit ls-files '**/.gitignore'\n\nEven better (but I'm not sure how this is all used in the end), can we\nperhaps build those in a .gitignore'd oss-fuzz/.build/.\n\nBut maybe not, and in any case that would be a larger change to the\nMakefile logic, so we can leave it for now, but I do think it makes\nsense to create a oss-fuzz/.gitignore in a v4.\n"},{"id":"463175","messageId":"pull.1353.v4.git.1663598215154.gitgitgadget@gmail.com","threadId":"58446","inReplyTo":"pull.1353.v3.git.1663542495094.gitgitgadget@gmail.com","subject":"[PATCH v4] fuzz: reorganise the path for existing oss-fuzz fuzzers","fromName":"Arthur Chan via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-09-19T14:36:54Z","receivedAt":"2022-09-19T14:37:05Z","isPatch":true,"sender":{"key":"arthur.chan@adalogics.com","avatar":"https://avatars.githubusercontent.com/u/33429318?v=4"},"body":"From: Arthur Chan \n\nThis patch is aimed to provide a better organisation for oss-fuzz\nfuzzers and to avoid top-level clustters in the git repository when\nmore fuzzers are introduced. In addition, grouping the fuzzers into\ntheir own directory separate their application on fuzz-testing from\nthe core functionalities of the git code. It also provide better\nand tidier structure the oss-fuzz fuzzing library to manage, locate,\nbuild and execute those fuzzers for fuzz-testing purposes in future\ndevelopment.\n\nA new direrctory oss-fuzz has been created and existing fuzzers are\nmoved into the new directory. Makefile and .gitignore have been\nfixed accordingly.\n\nCC: Josh Steadmon \nCC: David Korczynski \nSigned-off-by: Arthur Chan \n---\n fuzz: reorganise the path for existing oss-fuzz fuzzers\n \n This patch is aimed to provide a better organisation for oss-fuzz\n fuzzers and to avoid top-level clustters in the git repository when more\n fuzzers are introduced. In addition, grouping the fuzzers into their own\n directory separate their application on fuzz-testing from the core\n functionalities of the git code. It also provide better and tidier\n structure the oss-fuzz fuzzing library to manage, locate, build and\n execute those fuzzers for fuzz-testing purposes in future development.\n \n A new direrctory oss-fuzz has been created and existing fuzzers are\n moved into the new directory. Makefile and .gitignore have been fixed\n accordingly.\n \n Create new .gitignore file for the new directory in v4 and fix the\n commit message.\n \n CC: Josh Steadmon steadmon@google.com CC: David Korczynski\n david@adalogics.com Signed-off-by: Arthur Chan arthur.chan@adalogics.com\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1353%2Farthurscchan%2Frelocate-fuzzer-v4\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1353/arthurscchan/relocate-fuzzer-v4\nPull-Request: https://github.com/gitgitgadget/git/pull/1353\n\nRange-diff vs v3:\n\n 1: 21714e583aa ! 1: 82d9568ea65 fuzz: reorganise the path for existing oss-fuzz fuzzers\n @@ Commit message\n fuzz: reorganise the path for existing oss-fuzz fuzzers\n \n This patch is aimed to provide a better organisation for oss-fuzz\n - fuzzers, allowing more fuzzers for the git project to be added\n - in later development.\n + fuzzers and to avoid top-level clustters in the git repository when\n + more fuzzers are introduced. In addition, grouping the fuzzers into\n + their own directory separate their application on fuzz-testing from\n + the core functionalities of the git code. It also provide better\n + and tidier structure the oss-fuzz fuzzing library to manage, locate,\n + build and execute those fuzzers for fuzz-testing purposes in future\n + development.\n \n A new direrctory oss-fuzz has been created and existing fuzzers are\n moved into the new directory. Makefile and .gitignore have been\n @@ Commit message\n ## .gitignore ##\n @@\n -/fuzz-commit-graph\n -+/oss-fuzz/fuzz-commit-graph\n /fuzz_corpora\n -/fuzz-pack-headers\n -/fuzz-pack-idx\n -+/oss-fuzz/fuzz-pack-headers\n -+/oss-fuzz/fuzz-pack-idx\n /GIT-BUILD-OPTIONS\n /GIT-CFLAGS\n /GIT-LDFLAGS\n @@ Makefile: SCRIPTS = $(SCRIPT_SH_GEN) \\\n fuzz-objs: $(FUZZ_OBJS)\n \n \n + ## oss-fuzz/.gitignore (new) ##\n +@@\n ++fuzz-commit-graph\n ++fuzz-pack-headers\n ++fuzz-pack-idx\n +\n ## fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c ##\n \n ## fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c ##\n\n\n .gitignore | 3 ---\n Makefile | 6 +++---\n oss-fuzz/.gitignore | 3 +++\n fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c | 0\n fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c | 0\n fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c | 0\n 6 files changed, 6 insertions(+), 6 deletions(-)\n create mode 100644 oss-fuzz/.gitignore\n rename fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c (100%)\n rename fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c (100%)\n rename fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c (100%)\n\ndiff --git a/.gitignore b/.gitignore\nindex 80b530bbed2..ed8b9f04e5c 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -1,7 +1,4 @@\n-/fuzz-commit-graph\n /fuzz_corpora\n-/fuzz-pack-headers\n-/fuzz-pack-idx\n /GIT-BUILD-OPTIONS\n /GIT-CFLAGS\n /GIT-LDFLAGS\ndiff --git a/Makefile b/Makefile\nindex d9247ead45b..2d56aae7a1d 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -686,9 +686,9 @@ SCRIPTS = $(SCRIPT_SH_GEN) \\\n \n ETAGS_TARGET = TAGS\n \n-FUZZ_OBJS += fuzz-commit-graph.o\n-FUZZ_OBJS += fuzz-pack-headers.o\n-FUZZ_OBJS += fuzz-pack-idx.o\n+FUZZ_OBJS += oss-fuzz/fuzz-commit-graph.o\n+FUZZ_OBJS += oss-fuzz/fuzz-pack-headers.o\n+FUZZ_OBJS += oss-fuzz/fuzz-pack-idx.o\n .PHONY: fuzz-objs\n fuzz-objs: $(FUZZ_OBJS)\n \ndiff --git a/oss-fuzz/.gitignore b/oss-fuzz/.gitignore\nnew file mode 100644\nindex 00000000000..9acb74412ef\n--- /dev/null\n+++ b/oss-fuzz/.gitignore\n@@ -0,0 +1,3 @@\n+fuzz-commit-graph\n+fuzz-pack-headers\n+fuzz-pack-idx\ndiff --git a/fuzz-commit-graph.c b/oss-fuzz/fuzz-commit-graph.c\nsimilarity index 100%\nrename from fuzz-commit-graph.c\nrename to oss-fuzz/fuzz-commit-graph.c\ndiff --git a/fuzz-pack-headers.c b/oss-fuzz/fuzz-pack-headers.c\nsimilarity index 100%\nrename from fuzz-pack-headers.c\nrename to oss-fuzz/fuzz-pack-headers.c\ndiff --git a/fuzz-pack-idx.c b/oss-fuzz/fuzz-pack-idx.c\nsimilarity index 100%\nrename from fuzz-pack-idx.c\nrename to oss-fuzz/fuzz-pack-idx.c\n\nbase-commit: d3fa443f97e3a8d75b51341e2d5bac380b7422df\n-- \ngitgitgadget\n"},{"id":"463193","messageId":"xmqqbkrbcob9.fsf@gitster.g","threadId":"58446","inReplyTo":"pull.1353.v4.git.1663598215154.gitgitgadget@gmail.com","subject":"Re: [PATCH v4] fuzz: reorganise the path for existing oss-fuzz fuzzers","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-09-19T16:38:02Z","receivedAt":"2022-09-19T16:38:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Arthur Chan via GitGitGadget\" writes:\n\n> From: Arthur Chan \n>\n> This patch is aimed to provide a better organisation for oss-fuzz\n> fuzzers and to avoid top-level clustters in the git repository when\n> more fuzzers are introduced. In addition, grouping the fuzzers into\n> their own directory separate their application on fuzz-testing from\n> the core functionalities of the git code. It also provide better\n> and tidier structure the oss-fuzz fuzzing library to manage, locate,\n> build and execute those fuzzers for fuzz-testing purposes in future\n> development.\n>\n> A new direrctory oss-fuzz has been created and existing fuzzers are\n> moved into the new directory. Makefile and .gitignore have been\n> fixed accordingly.\n>\n> CC: Josh Steadmon \n> CC: David Korczynski \n> Signed-off-by: Arthur Chan \n> ---\n\nThanks. Will queue with a bit of rephrasing of the above.\n"},{"id":"463194","messageId":"xmqq7d1zco6k.fsf@gitster.g","threadId":"58446","inReplyTo":"pull.1353.v4.git.1663598215154.gitgitgadget@gmail.com","subject":"Re: [PATCH v4] fuzz: reorganise the path for existing oss-fuzz fuzzers","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-09-19T16:40:51Z","receivedAt":"2022-09-19T16:40:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Arthur Chan via GitGitGadget\" writes:\n\n> From: Arthur Chan \n>\n> This patch is aimed to provide a better organisation for oss-fuzz\n> fuzzers and to avoid top-level clustters in the git repository when\n> more fuzzers are introduced. In addition, grouping the fuzzers into\n> their own directory separate their application on fuzz-testing from\n> the core functionalities of the git code. It also provide better\n> and tidier structure the oss-fuzz fuzzing library to manage, locate,\n> build and execute those fuzzers for fuzz-testing purposes in future\n> development.\n>\n> A new direrctory oss-fuzz has been created and existing fuzzers are\n> moved into the new directory. Makefile and .gitignore have been\n> fixed accordingly.\n>\n> CC: Josh Steadmon \n> CC: David Korczynski \n\nIf you mean to tell these people about your work, write these lines\non the header of your outgoing e-mail (or instruct GitGitGadget to\ndo so), not here (if writing them here is the only way to instruct\nGGG to do so then I wouldn't object, but apparently that is not\nhappening and I had to add them manually to this message.\n\nThanks.\n\n> Signed-off-by: Arthur Chan \n> ---\n> fuzz: reorganise the path for existing oss-fuzz fuzzers\n> \n> This patch is aimed to provide a better organisation for oss-fuzz\n> fuzzers and to avoid top-level clustters in the git repository when more\n> fuzzers are introduced. In addition, grouping the fuzzers into their own\n> directory separate their application on fuzz-testing from the core\n> functionalities of the git code. It also provide better and tidier\n> structure the oss-fuzz fuzzing library to manage, locate, build and\n> execute those fuzzers for fuzz-testing purposes in future development.\n> \n> A new direrctory oss-fuzz has been created and existing fuzzers are\n> moved into the new directory. Makefile and .gitignore have been fixed\n> accordingly.\n> \n> Create new .gitignore file for the new directory in v4 and fix the\n> commit message.\n> \n> CC: Josh Steadmon steadmon@google.com CC: David Korczynski\n> david@adalogics.com Signed-off-by: Arthur Chan arthur.chan@adalogics.com\n>\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1353%2Farthurscchan%2Frelocate-fuzzer-v4\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1353/arthurscchan/relocate-fuzzer-v4\n> Pull-Request: https://github.com/gitgitgadget/git/pull/1353\n>\n> Range-diff vs v3:\n>\n> 1: 21714e583aa ! 1: 82d9568ea65 fuzz: reorganise the path for existing oss-fuzz fuzzers\n> @@ Commit message\n> fuzz: reorganise the path for existing oss-fuzz fuzzers\n> \n> This patch is aimed to provide a better organisation for oss-fuzz\n> - fuzzers, allowing more fuzzers for the git project to be added\n> - in later development.\n> + fuzzers and to avoid top-level clustters in the git repository when\n> + more fuzzers are introduced. In addition, grouping the fuzzers into\n> + their own directory separate their application on fuzz-testing from\n> + the core functionalities of the git code. It also provide better\n> + and tidier structure the oss-fuzz fuzzing library to manage, locate,\n> + build and execute those fuzzers for fuzz-testing purposes in future\n> + development.\n> \n> A new direrctory oss-fuzz has been created and existing fuzzers are\n> moved into the new directory. Makefile and .gitignore have been\n> @@ Commit message\n> ## .gitignore ##\n> @@\n> -/fuzz-commit-graph\n> -+/oss-fuzz/fuzz-commit-graph\n> /fuzz_corpora\n> -/fuzz-pack-headers\n> -/fuzz-pack-idx\n> -+/oss-fuzz/fuzz-pack-headers\n> -+/oss-fuzz/fuzz-pack-idx\n> /GIT-BUILD-OPTIONS\n> /GIT-CFLAGS\n> /GIT-LDFLAGS\n> @@ Makefile: SCRIPTS = $(SCRIPT_SH_GEN) \\\n> fuzz-objs: $(FUZZ_OBJS)\n> \n> \n> + ## oss-fuzz/.gitignore (new) ##\n> +@@\n> ++fuzz-commit-graph\n> ++fuzz-pack-headers\n> ++fuzz-pack-idx\n> +\n> ## fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c ##\n> \n> ## fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c ##\n>\n>\n> .gitignore | 3 ---\n> Makefile | 6 +++---\n> oss-fuzz/.gitignore | 3 +++\n> fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c | 0\n> fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c | 0\n> fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c | 0\n> 6 files changed, 6 insertions(+), 6 deletions(-)\n> create mode 100644 oss-fuzz/.gitignore\n> rename fuzz-commit-graph.c => oss-fuzz/fuzz-commit-graph.c (100%)\n> rename fuzz-pack-headers.c => oss-fuzz/fuzz-pack-headers.c (100%)\n> rename fuzz-pack-idx.c => oss-fuzz/fuzz-pack-idx.c (100%)\n>\n> diff --git a/.gitignore b/.gitignore\n> index 80b530bbed2..ed8b9f04e5c 100644\n> --- a/.gitignore\n> +++ b/.gitignore\n> @@ -1,7 +1,4 @@\n> -/fuzz-commit-graph\n> /fuzz_corpora\n> -/fuzz-pack-headers\n> -/fuzz-pack-idx\n> /GIT-BUILD-OPTIONS\n> /GIT-CFLAGS\n> /GIT-LDFLAGS\n> diff --git a/Makefile b/Makefile\n> index d9247ead45b..2d56aae7a1d 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -686,9 +686,9 @@ SCRIPTS = $(SCRIPT_SH_GEN) \\\n> \n> ETAGS_TARGET = TAGS\n> \n> -FUZZ_OBJS += fuzz-commit-graph.o\n> -FUZZ_OBJS += fuzz-pack-headers.o\n> -FUZZ_OBJS += fuzz-pack-idx.o\n> +FUZZ_OBJS += oss-fuzz/fuzz-commit-graph.o\n> +FUZZ_OBJS += oss-fuzz/fuzz-pack-headers.o\n> +FUZZ_OBJS += oss-fuzz/fuzz-pack-idx.o\n> .PHONY: fuzz-objs\n> fuzz-objs: $(FUZZ_OBJS)\n> \n> diff --git a/oss-fuzz/.gitignore b/oss-fuzz/.gitignore\n> new file mode 100644\n> index 00000000000..9acb74412ef\n> --- /dev/null\n> +++ b/oss-fuzz/.gitignore\n> @@ -0,0 +1,3 @@\n> +fuzz-commit-graph\n> +fuzz-pack-headers\n> +fuzz-pack-idx\n> diff --git a/fuzz-commit-graph.c b/oss-fuzz/fuzz-commit-graph.c\n> similarity index 100%\n> rename from fuzz-commit-graph.c\n> rename to oss-fuzz/fuzz-commit-graph.c\n> diff --git a/fuzz-pack-headers.c b/oss-fuzz/fuzz-pack-headers.c\n> similarity index 100%\n> rename from fuzz-pack-headers.c\n> rename to oss-fuzz/fuzz-pack-headers.c\n> diff --git a/fuzz-pack-idx.c b/oss-fuzz/fuzz-pack-idx.c\n> similarity index 100%\n> rename from fuzz-pack-idx.c\n> rename to oss-fuzz/fuzz-pack-idx.c\n>\n> base-commit: d3fa443f97e3a8d75b51341e2d5bac380b7422df\n"}]}