| Message ID | 38924d9c4994b5bad93cbbd2659666f6b452a89f.1585269773.git.liu.denton@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | t: replace incorrect test_must_fail usage (part 3) | expand |
Denton Liu <liu.denton@gmail.com> writes: > Subject: Re: [PATCH v2 9/9] fixup! t5512: stop losing git exit code in here-docs Forgot to do the final "rebase -i --autosquash"? > Signed-off-by: Denton Liu <liu.denton@gmail.com> > --- > t/t5512-ls-remote.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh > index 8928d1f62d..e98c3a0174 100755 > --- a/t/t5512-ls-remote.sh > +++ b/t/t5512-ls-remote.sh > @@ -224,7 +224,7 @@ test_expect_success 'ls-remote --symref' ' > oid=$(git rev-parse HEAD) && > echo "$oid refs/remotes/origin/HEAD" >>expect && > generate_references \ > - refs/remotes/origin/master \ > + refs/remotes/origin/master \ > refs/tags/mark \ > refs/tags/mark1.1 \ > refs/tags/mark1.10 \
On Fri, Mar 27, 2020 at 1:46 PM Junio C Hamano <gitster@pobox.com> wrote: > > Subject: Re: [PATCH v2 9/9] fixup! t5512: stop losing git exit code in here-docs > > Forgot to do the final "rebase -i --autosquash"? My guess is that Denton sent this "fixup!" to have it queued atop [1] in response to the review comment[2] pointing out the bad indentation (rather than re-sending the entire series just for one minor change). [1]: https://lore.kernel.org/git/cover.1585209554.git.liu.denton@gmail.com/ [2]: https://lore.kernel.org/git/CAPig+cTpV2n66nYJdQpG0tYCu5f=PB-a9Boa_NNfVaUOshDVug@mail.gmail.com/
Eric Sunshine <sunshine@sunshineco.com> writes: > On Fri, Mar 27, 2020 at 1:46 PM Junio C Hamano <gitster@pobox.com> wrote: >> > Subject: Re: [PATCH v2 9/9] fixup! t5512: stop losing git exit code in here-docs >> >> Forgot to do the final "rebase -i --autosquash"? > > My guess is that Denton sent this "fixup!" to have it queued atop [1] > in response to the review comment[2] pointing out the bad indentation Ah, [9/9] fooled me (and caused me not to see eight in [1/8]-[8/8] and I mistook they were [1/9]-[8/9]. Usually people do the "oops, here is a hotfix" by marking such a "beyond the original set" patch as [9/8]. In any case, I think I've squashed it to the original. Thanks.
diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh index 8928d1f62d..e98c3a0174 100755 --- a/t/t5512-ls-remote.sh +++ b/t/t5512-ls-remote.sh @@ -224,7 +224,7 @@ test_expect_success 'ls-remote --symref' ' oid=$(git rev-parse HEAD) && echo "$oid refs/remotes/origin/HEAD" >>expect && generate_references \ - refs/remotes/origin/master \ + refs/remotes/origin/master \ refs/tags/mark \ refs/tags/mark1.1 \ refs/tags/mark1.10 \
Signed-off-by: Denton Liu <liu.denton@gmail.com> --- t/t5512-ls-remote.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)