Luke Diamand <l...@diamand.org> writes: >> However, instead of a separate patch, wouldn't it be better to squash >> it into the previous one? So 'make test' would succeed on every >> commit even with a newer p4 version. > > Junio? > > I can squash together the original commit and the two fixes if that > would be better?
Among the three hunks in this fix-up patch, the first two are strictly fixing what you had in the previous patch, so it make sense to fix them at the source by squashing. The last one (i.e. "even if it is verbose, if fileSize is not reported, do not write the verbose output") does not look like it is limited to the unshelve feature, so it might, even though it is a one-liner, deserve to be a separate preparatory patch if you want. But I do not feel strongly about either way. Thanks.
