[PATCH 3/4] rebase: test ack
test ack! handling Signed-off-by: Michael S. Tsirkin --- t/t3415-rebase-autosquash.sh | 15 +++ 1 file changed, 15 insertions(+) diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 8f53e54..e78897d 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -74,6 +74,21 @@ test_expect_success 'auto squash (option)' ' test_auto_squash final-squash --autosquash ' +test_expect_success 'auto ack' ' + ack="Acked-by: xyz" && + msg=$(test_write_lines "ack! first commit" "" "$ack") && + git reset --hard base && + git commit --allow-empty -m "$msg" -- && + git tag ack && + test_tick && + git rebase --autosquash -i HEAD^^^ && + git log --oneline >actual && + git show -s first-commit | grep -v ^commit > expected-msg && + echo "$ack" >> expected-msg && + git show -s HEAD^ | grep -v ^commit > actual-msg && + diff actual-msg expected-msg +' + test_expect_success 'auto squash (config)' ' git config rebase.autosquash true && test_auto_squash final-squash-config-true && -- MST -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] rebase: test ack
"Michael S. Tsirkin" writes: > On Wed, May 21, 2014 at 09:54:47AM -0700, Junio C Hamano wrote: >> "Michael S. Tsirkin" writes: >> >> > On Tue, May 20, 2014 at 08:13:27AM -0700, Junio C Hamano wrote: >> >> "Michael S. Tsirkin" writes: >> >> >> >> > Just to clarify I can post v2 of 4/4 without reposting 1-3 since they >> >> > are queued? >> >> >> >> If you need to update anything queued only on 'pu' but not yet in >> >> 'next', it is customary to ... >> > >> > Actually I don't see anything like it in pu. >> ... > Oh sorry, didn't mean to try to pressure you. I was just surprised > not to see it there. I know this applies cleanly to next so I'll just > wait for 2.0 to be out. Oh, no. No pressure felt and no need to be sorry about anything. I described a preferred procedure when the topic appeared in 'pu', and I didn't answer your question for topics that are not even in 'pu' yet. Being in 'pu' and not in 'next' is not much different from not being in 'pu', so the preferred procedure is to send out the entire series (unless it is a large 47-patch series ;-) to give everybody another chance to comment, and it would be extra nice if you indicated which ones are unchanged since the previous round to help those who did already saw them. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] rebase: test ack
On Wed, May 21, 2014 at 09:54:47AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" writes: > > > On Tue, May 20, 2014 at 08:13:27AM -0700, Junio C Hamano wrote: > >> "Michael S. Tsirkin" writes: > >> > >> > Just to clarify I can post v2 of 4/4 without reposting 1-3 since they > >> > are queued? > >> > >> If you need to update anything queued only on 'pu' but not yet in > >> 'next', it is customary to resend the whole for everybody to see > >> (what is already in 'next' should only be built upon incrementally > >> and not updated with replacement patches), while noting which ones > >> are the same as before. Christian Couder has been doing it nicely > >> in his recent rerolls (if the series were not in 'next', that is). > >> > >> Thanks. > > > > Actually I don't see anything like it in pu. > > The way I usually work is to apply a non-fix (i.e. enhancement) > series on a topic branch forked from 'master' (or the last tagged > version contained in its tip) and see if it makes sense, and then > try-merge the result to 'next' to see if it is free of potential > funny interactions with other topics that are already in flight. > After that happens, the topic branch is merged to somewhere in 'pu'. > > It is possible that I did not have time to go through all the steps > above (after all, I had to make another -rc release and there was an > unexpected last-minute change of plans in the morning that blew a > few hours of work). Or there may have been some merge conflicts > that I didn't feel like resolving for various reasons (e.g. if I > knew the series would be rerolled anyway, it can wait; if the other > topic that interacts with your series has been cooking sufficiently > long in 'next' and if it is very close to the final release of this > cycle, it may be easier to wait for the other topic to graduate to > 'master', which would happen soon after this cycle finishes, and ask > you to rebase your series). > > I don't remember which ;-) > Oh sorry, didn't mean to try to pressure you. I was just surprised not to see it there. I know this applies cleanly to next so I'll just wait for 2.0 to be out. -- MST -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] rebase: test ack
"Michael S. Tsirkin" writes: > On Tue, May 20, 2014 at 08:13:27AM -0700, Junio C Hamano wrote: >> "Michael S. Tsirkin" writes: >> >> > Just to clarify I can post v2 of 4/4 without reposting 1-3 since they >> > are queued? >> >> If you need to update anything queued only on 'pu' but not yet in >> 'next', it is customary to resend the whole for everybody to see >> (what is already in 'next' should only be built upon incrementally >> and not updated with replacement patches), while noting which ones >> are the same as before. Christian Couder has been doing it nicely >> in his recent rerolls (if the series were not in 'next', that is). >> >> Thanks. > > Actually I don't see anything like it in pu. The way I usually work is to apply a non-fix (i.e. enhancement) series on a topic branch forked from 'master' (or the last tagged version contained in its tip) and see if it makes sense, and then try-merge the result to 'next' to see if it is free of potential funny interactions with other topics that are already in flight. After that happens, the topic branch is merged to somewhere in 'pu'. It is possible that I did not have time to go through all the steps above (after all, I had to make another -rc release and there was an unexpected last-minute change of plans in the morning that blew a few hours of work). Or there may have been some merge conflicts that I didn't feel like resolving for various reasons (e.g. if I knew the series would be rerolled anyway, it can wait; if the other topic that interacts with your series has been cooking sufficiently long in 'next' and if it is very close to the final release of this cycle, it may be easier to wait for the other topic to graduate to 'master', which would happen soon after this cycle finishes, and ask you to rebase your series). I don't remember which ;-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] rebase: test ack
On Tue, May 20, 2014 at 08:13:27AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" writes: > > > Just to clarify I can post v2 of 4/4 without reposting 1-3 since they > > are queued? > > If you need to update anything queued only on 'pu' but not yet in > 'next', it is customary to resend the whole for everybody to see > (what is already in 'next' should only be built upon incrementally > and not updated with replacement patches), while noting which ones > are the same as before. Christian Couder has been doing it nicely > in his recent rerolls (if the series were not in 'next', that is). > > Thanks. Actually I don't see anything like it in pu. What I would like is for 1-3 to be in pu, 4/4 was for illustrative purposes it's not yet ready for that, and 1-3 are useful by themselves. I could then iterate on 4/4 without reposting 1-3. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] rebase: test ack
"Michael S. Tsirkin" writes: > Just to clarify I can post v2 of 4/4 without reposting 1-3 since they > are queued? If you need to update anything queued only on 'pu' but not yet in 'next', it is customary to resend the whole for everybody to see (what is already in 'next' should only be built upon incrementally and not updated with replacement patches), while noting which ones are the same as before. Christian Couder has been doing it nicely in his recent rerolls (if the series were not in 'next', that is). Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] rebase: test ack
On Mon, May 19, 2014 at 02:34:26PM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" writes: > > > test ack! handling > > > > Signed-off-by: Michael S. Tsirkin > > Will queue with this squashed in. > > 4/4 seems to have some style issues as well, but I didn't look very > closely. > > Thanks. Just to clarify I can post v2 of 4/4 without reposting 1-3 since they are queued? > t/t3415-rebase-autosquash.sh | 12 ++-- > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh > index 9d7db13..dcdba6f 100755 > --- a/t/t3415-rebase-autosquash.sh > +++ b/t/t3415-rebase-autosquash.sh > @@ -75,18 +75,18 @@ test_expect_success 'auto squash (option)' ' > ' > > test_expect_success 'auto ack' ' > - ack="Acked-by: xyz" > - msg=$(test_write_lines "ack! first commit" "" "$ack") > + ack="Acked-by: xyz" && > + msg=$(test_write_lines "ack! first commit" "" "$ack") && > git reset --hard base && > git commit --allow-empty -m "$msg" -- && > git tag ack && > test_tick && > git rebase --autosquash -i HEAD^^^ && > git log --oneline >actual && > - git show -s first-commit | grep -v ^commit > expected-msg && > - echo "$ack" >> expected-msg && > - git show -s HEAD^ | grep -v ^commit > actual-msg && > - diff actual-msg expected-msg > + git show -s first-commit | grep -v ^commit >expected-msg && > + echo "$ack" >>expected-msg && > + git show -s HEAD^ | grep -v ^commit >actual-msg && > + test_cmp actual-msg expected-msg > ' > > test_expect_success 'auto squash (config)' ' -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] rebase: test ack
On Mon, May 19, 2014 at 02:34:26PM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" writes: > > > test ack! handling > > > > Signed-off-by: Michael S. Tsirkin > > Will queue with this squashed in. Thanks! And sorry about the style issues. > 4/4 seems to have some style issues as well, but I didn't look very > closely. I'll try to clean it for the next submission. I'll be glad to hear about them as well. Thanks! > Thanks. > > t/t3415-rebase-autosquash.sh | 12 ++-- > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh > index 9d7db13..dcdba6f 100755 > --- a/t/t3415-rebase-autosquash.sh > +++ b/t/t3415-rebase-autosquash.sh > @@ -75,18 +75,18 @@ test_expect_success 'auto squash (option)' ' > ' > > test_expect_success 'auto ack' ' > - ack="Acked-by: xyz" > - msg=$(test_write_lines "ack! first commit" "" "$ack") > + ack="Acked-by: xyz" && > + msg=$(test_write_lines "ack! first commit" "" "$ack") && > git reset --hard base && > git commit --allow-empty -m "$msg" -- && > git tag ack && > test_tick && > git rebase --autosquash -i HEAD^^^ && > git log --oneline >actual && > - git show -s first-commit | grep -v ^commit > expected-msg && > - echo "$ack" >> expected-msg && > - git show -s HEAD^ | grep -v ^commit > actual-msg && > - diff actual-msg expected-msg > + git show -s first-commit | grep -v ^commit >expected-msg && > + echo "$ack" >>expected-msg && > + git show -s HEAD^ | grep -v ^commit >actual-msg && > + test_cmp actual-msg expected-msg > ' > > test_expect_success 'auto squash (config)' ' -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] rebase: test ack
"Michael S. Tsirkin" writes: > test ack! handling > > Signed-off-by: Michael S. Tsirkin Will queue with this squashed in. 4/4 seems to have some style issues as well, but I didn't look very closely. Thanks. t/t3415-rebase-autosquash.sh | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 9d7db13..dcdba6f 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -75,18 +75,18 @@ test_expect_success 'auto squash (option)' ' ' test_expect_success 'auto ack' ' - ack="Acked-by: xyz" - msg=$(test_write_lines "ack! first commit" "" "$ack") + ack="Acked-by: xyz" && + msg=$(test_write_lines "ack! first commit" "" "$ack") && git reset --hard base && git commit --allow-empty -m "$msg" -- && git tag ack && test_tick && git rebase --autosquash -i HEAD^^^ && git log --oneline >actual && - git show -s first-commit | grep -v ^commit > expected-msg && - echo "$ack" >> expected-msg && - git show -s HEAD^ | grep -v ^commit > actual-msg && - diff actual-msg expected-msg + git show -s first-commit | grep -v ^commit >expected-msg && + echo "$ack" >>expected-msg && + git show -s HEAD^ | grep -v ^commit >actual-msg && + test_cmp actual-msg expected-msg ' test_expect_success 'auto squash (config)' ' -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/4] rebase: test ack
test ack! handling Signed-off-by: Michael S. Tsirkin --- t/t3415-rebase-autosquash.sh | 15 +++ 1 file changed, 15 insertions(+) diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 41370ab..9d7db13 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -74,6 +74,21 @@ test_expect_success 'auto squash (option)' ' test_auto_squash final-squash --autosquash ' +test_expect_success 'auto ack' ' + ack="Acked-by: xyz" + msg=$(test_write_lines "ack! first commit" "" "$ack") + git reset --hard base && + git commit --allow-empty -m "$msg" -- && + git tag ack && + test_tick && + git rebase --autosquash -i HEAD^^^ && + git log --oneline >actual && + git show -s first-commit | grep -v ^commit > expected-msg && + echo "$ack" >> expected-msg && + git show -s HEAD^ | grep -v ^commit > actual-msg && + diff actual-msg expected-msg +' + test_expect_success 'auto squash (config)' ' git config rebase.autosquash true && test_auto_squash final-squash-config-true && -- MST -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
