[git-users] Re: Missing commit after rebase
Try this *git rebase -i --stat --allow-empty-message --keep-empty -v --verify --no-ff "Tag2"* and simply close the editor as it opens (this is an interactive command). Il giorno mercoledì 10 aprile 2019 10:34:45 UTC+2, webi123 ha scritto: > > Hi all, > > when I rebase branch2 from one tag (Tag1) to the next one (Tag2) in the > attached repository example, I expect that the second revert commit of line > (Revert "line added") should be kept in branch2 but it isn't. Why does git > remove all revert commits of line when it reapplies the commits of branch1? > > *before (see missing-revert.tar.gz):* > > * 0fdb98c (HEAD -> refs/heads/branch2, refs/heads/branch1) Revert "line > added" > * 98fec77 line added > * 6fc6324 Revert "line added" > * cab0b6f line3 added > | * ee1cb29 (tag: refs/tags/Tag2, refs/heads/master) Added line4 > | * b9d49cd Revert "line added" > | * a15b6a9 line3 added > |/ > * 07ea1d5 (tag: refs/tags/Tag1) line2 added > * 4ded20a line added > * 7085888 init > > *after (branch2) $ git rebase Tag2:* > > * e15499e (HEAD -> refs/heads/branch2) line added > * ee1cb29 (tag: refs/tags/Tag2, refs/heads/master) Added line4 > * b9d49cd Revert "line added" > * a15b6a9 line3 added > | * 0fdb98c (refs/heads/branch1) Revert "line added" > | * 98fec77 line added > | * 6fc6324 Revert "line added" > | * cab0b6f line3 added > |/ > * 07ea1d5 (tag: refs/tags/Tag1) line2 added > * 4ded20a line added > * 7085888 init > > Any hint is welcome. Thank you. > > BR > webi123 > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] Re: Missing commit after rebase
You will find the repo attached in the first message. Am Donnerstag, 11. April 2019 19:11:11 UTC+2 schrieb never...@gmail.com: > > Hi Martin, pelase could you send the git project via WeTransfer? > Regards. > > > > Il giorno mercoledì 10 aprile 2019 10:34:45 UTC+2, webi123 ha scritto: >> >> Hi all, >> >> when I rebase branch2 from one tag (Tag1) to the next one (Tag2) in the >> attached repository example, I expect that the second revert commit of line >> (Revert "line added") should be kept in branch2 but it isn't. Why does git >> remove all revert commits of line when it reapplies the commits of branch1? >> >> *before (see missing-revert.tar.gz):* >> >> * 0fdb98c (HEAD -> refs/heads/branch2, refs/heads/branch1) Revert "line >> added" >> * 98fec77 line added >> * 6fc6324 Revert "line added" >> * cab0b6f line3 added >> | * ee1cb29 (tag: refs/tags/Tag2, refs/heads/master) Added line4 >> | * b9d49cd Revert "line added" >> | * a15b6a9 line3 added >> |/ >> * 07ea1d5 (tag: refs/tags/Tag1) line2 added >> * 4ded20a line added >> * 7085888 init >> >> *after (branch2) $ git rebase Tag2:* >> >> * e15499e (HEAD -> refs/heads/branch2) line added >> * ee1cb29 (tag: refs/tags/Tag2, refs/heads/master) Added line4 >> * b9d49cd Revert "line added" >> * a15b6a9 line3 added >> | * 0fdb98c (refs/heads/branch1) Revert "line added" >> | * 98fec77 line added >> | * 6fc6324 Revert "line added" >> | * cab0b6f line3 added >> |/ >> * 07ea1d5 (tag: refs/tags/Tag1) line2 added >> * 4ded20a line added >> * 7085888 init >> >> Any hint is welcome. Thank you. >> >> BR >> webi123 >> > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] Re: Missing commit after rebase
Hi Martin, pelase could you send the git project via WeTransfer? Regards. Il giorno mercoledì 10 aprile 2019 10:34:45 UTC+2, webi123 ha scritto: > > Hi all, > > when I rebase branch2 from one tag (Tag1) to the next one (Tag2) in the > attached repository example, I expect that the second revert commit of line > (Revert "line added") should be kept in branch2 but it isn't. Why does git > remove all revert commits of line when it reapplies the commits of branch1? > > *before (see missing-revert.tar.gz):* > > * 0fdb98c (HEAD -> refs/heads/branch2, refs/heads/branch1) Revert "line > added" > * 98fec77 line added > * 6fc6324 Revert "line added" > * cab0b6f line3 added > | * ee1cb29 (tag: refs/tags/Tag2, refs/heads/master) Added line4 > | * b9d49cd Revert "line added" > | * a15b6a9 line3 added > |/ > * 07ea1d5 (tag: refs/tags/Tag1) line2 added > * 4ded20a line added > * 7085888 init > > *after (branch2) $ git rebase Tag2:* > > * e15499e (HEAD -> refs/heads/branch2) line added > * ee1cb29 (tag: refs/tags/Tag2, refs/heads/master) Added line4 > * b9d49cd Revert "line added" > * a15b6a9 line3 added > | * 0fdb98c (refs/heads/branch1) Revert "line added" > | * 98fec77 line added > | * 6fc6324 Revert "line added" > | * cab0b6f line3 added > |/ > * 07ea1d5 (tag: refs/tags/Tag1) line2 added > * 4ded20a line added > * 7085888 init > > Any hint is welcome. Thank you. > > BR > webi123 > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] Re: Missing commit after rebase
Hi Antonio, thank you for your hint. You will find the repository before the rebase in the attached missing-revert.tar.gz. The instruction to be applied is the following (on branch2): $ git rebase Tag2 BR Am Donnerstag, 11. April 2019 10:54:26 UTC+2 schrieb never...@gmail.com: > > Hi Martin, > I didn't understand very well, to reproduce your situation I would need > >- the repository BEFORE your rebasing, >- the exact rebasing instruction you execute, > > however remember that rebasing doesn't move commits, it just clones them, > so the references to the tags are lost because old tags still remain linked > to old commits. > I hope this will help you: for further investigation, please see above > requests of mine. > Regards. > Antonio > > > > Il giorno mercoledì 10 aprile 2019 10:34:45 UTC+2, webi123 ha scritto: >> >> Hi all, >> >> when I rebase branch2 from one tag (Tag1) to the next one (Tag2) in the >> attached repository example, I expect that the second revert commit of line >> (Revert "line added") should be kept in branch2 but it isn't. Why does git >> remove all revert commits of line when it reapplies the commits of branch1? >> >> *before (see missing-revert.tar.gz):* >> >> * 0fdb98c (HEAD -> refs/heads/branch2, refs/heads/branch1) Revert "line >> added" >> * 98fec77 line added >> * 6fc6324 Revert "line added" >> * cab0b6f line3 added >> | * ee1cb29 (tag: refs/tags/Tag2, refs/heads/master) Added line4 >> | * b9d49cd Revert "line added" >> | * a15b6a9 line3 added >> |/ >> * 07ea1d5 (tag: refs/tags/Tag1) line2 added >> * 4ded20a line added >> * 7085888 init >> >> *after (branch2) $ git rebase Tag2:* >> >> * e15499e (HEAD -> refs/heads/branch2) line added >> * ee1cb29 (tag: refs/tags/Tag2, refs/heads/master) Added line4 >> * b9d49cd Revert "line added" >> * a15b6a9 line3 added >> | * 0fdb98c (refs/heads/branch1) Revert "line added" >> | * 98fec77 line added >> | * 6fc6324 Revert "line added" >> | * cab0b6f line3 added >> |/ >> * 07ea1d5 (tag: refs/tags/Tag1) line2 added >> * 4ded20a line added >> * 7085888 init >> >> Any hint is welcome. Thank you. >> >> BR >> webi123 >> > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] Re: Missing commit after rebase
Hi Martin, I didn't understand very well, to reproduce your situation I would need - the repository BEFORE your rebasing, - the exact rebasing instruction you execute, however remember that rebasing doesn't move commits, it just clones them, so the references to the tags are lost because old tags still remain linked to old commits. I hope this will help you: for further investigation, please see above requests of mine. Regards. Antonio Il giorno mercoledì 10 aprile 2019 10:34:45 UTC+2, webi123 ha scritto: > > Hi all, > > when I rebase branch2 from one tag (Tag1) to the next one (Tag2) in the > attached repository example, I expect that the second revert commit of line > (Revert "line added") should be kept in branch2 but it isn't. Why does git > remove all revert commits of line when it reapplies the commits of branch1? > > *before (see missing-revert.tar.gz):* > > * 0fdb98c (HEAD -> refs/heads/branch2, refs/heads/branch1) Revert "line > added" > * 98fec77 line added > * 6fc6324 Revert "line added" > * cab0b6f line3 added > | * ee1cb29 (tag: refs/tags/Tag2, refs/heads/master) Added line4 > | * b9d49cd Revert "line added" > | * a15b6a9 line3 added > |/ > * 07ea1d5 (tag: refs/tags/Tag1) line2 added > * 4ded20a line added > * 7085888 init > > *after (branch2) $ git rebase Tag2:* > > * e15499e (HEAD -> refs/heads/branch2) line added > * ee1cb29 (tag: refs/tags/Tag2, refs/heads/master) Added line4 > * b9d49cd Revert "line added" > * a15b6a9 line3 added > | * 0fdb98c (refs/heads/branch1) Revert "line added" > | * 98fec77 line added > | * 6fc6324 Revert "line added" > | * cab0b6f line3 added > |/ > * 07ea1d5 (tag: refs/tags/Tag1) line2 added > * 4ded20a line added > * 7085888 init > > Any hint is welcome. Thank you. > > BR > webi123 > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
