#8151 The commendation to do a rebase after branching is wrong
Closed: Fixed 3 years ago by mohanboddu. Opened 3 years ago by zbyszek.

  • Describe the issue
    The email that is sent out:

    Fedora 30 has now been branched, please be sure to do a git pull
    --rebase to pick up the new branch

This is wrong. Releng simply creates a new branch, so this has no relation to a rebase. Please just say "git fetch".

so this means that anything you do for f30 you also have to do in the
master branch and do a build there

This is also misleading. Any work should be done in master/F31 first, and only then redone in F30. There are exceptions, but the general rule is the opposite of what is suggested here. So please say "anything you do for rawhide, you also have to do in the F30 branch and ...".

  • When do you need this? (YYYY/MM/DD)
    Before next branching.

  • When is this no longer needed or useful? (YYYY/MM/DD)
    Never.

  • If we cannot complete your request, what is the impact?
    Nothing, except possibly a few more new contributors being confused.


@zbyszek git fetch will work, I am just used to git pull :smile:

I will also fix the other comment you made in the next notification for the next release.

Thanks for your input.

Metadata Update from @mohanboddu:
- Issue close_status updated to: Fixed
- Issue status updated to: Closed (was: Open)

3 years ago

Thanks.

git pull is actually better than git fetch. No reason to not update the branch.

git pull runs git fetch with the given parameters and calls git merge to merge the retrieved branch heads into the current branch.

https://git-scm.com/docs/git-pull

There is no reason to merge the retrieved branch heads into the current branch when trying to get a new branch. In fact, it can make you solve another problem now instead of leaving it for later.

Yeah, but a bare git pull (which is what @mohanboddu mentioned and what I was replying to), would operate on the current (pre-existing) branch, and the new branch created by releng would be fetched as a side effect. git pull has the desired effect of local repo getting information about the new remote branch, while also merging any remote changes on the current branch. SInce one probably wants to do git pull anyway, so we can just simplify things by recommending just that.

Login to comment on this ticket.

Metadata