On Tue, Jun 2, 2015 at 11:59 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Stefan Beller <sbeller@xxxxxxxxxx> writes: > >> Subject: [RFCv2 04/16] upload-pack-2: Implement the version 2 of upload-pack > > Nit; s/I/i/, to match others in the series, I think. > >> In upload-pack-2 we send each capability in its own packet buffer. >> >> Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> >> --- >> >> Notes: >> Moved the capabilities into a struct containing all the capabilities, >> and then we selectively cancel out unwanted capabilities. > >> diff --git a/upload-pack-2.c b/upload-pack-2.c >> new file mode 120000 >> index 0000000..e30a871 >> --- /dev/null >> +++ b/upload-pack-2.c >> @@ -0,0 +1 @@ >> +upload-pack.c >> \ No newline at end of file > > Yuck. > > Can't we do an equivalent without this symbolic link, i.e. a new > Makefile rule to compile upload-pack.c in two different ways to two > different object files? Ok I changed that and it works now (only one upload-pack.c file no upload-pack-2.c and no corresponding object either.) However we don't want to have the version used in upload pack depending on the file name at run time, which is why I am reverting to this state and depending on the file name at compile time. Instead of a symlink we could use an option passed into the compiler as well, but I am not sure if that is as easy to add to the Makefile as this way. > > The way this patch is organized makes it unclear which part is what > was added for v2 and which part is shared with v1 (and changes can > be possible breakage to the existing code), leading to a patch that > is hard to review. ok :( Changed in a reroll. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html