Bringing header stacks in conformance with latest spec.

[mihaibudiu]

git is again confused about which commits are in this PR; I will have to reset again.
I wish I could figure out that this will happen before I submit the PR.

[sethfowler]

FYI, the PR contains all the commits that your version of the branch has that the version in this repo doesn't. To keep the PR clean, you have to work on each PR in a separate branch.

[mihaibudiu]

Yes, I was working under the optimistic assumption that all these commits will be merged, since they are all fairly small and bugfixes. If it is necessary I can submit separate PRs too.

However, the first 5 commits listed in the PR have already been merged even in your repo, so that seems to be an issue with git on my side understanding this fact.

[sethfowler]

They're "different" commits from git's point of view because the SHA is different, which is a consequence of the fact that you're merging upstream/master into your branch. If you rebase your branch onto upstream/master, rather than merging, you'll avoid that problem.

[ChrisDodd]

merged as 76d35a5

[jnfoster]

Thanks Mihai!

…

On Thu, Dec 22, 2016 at 2:25 PM, Mihai Budiu ***@***.***> wrote: git is again confused about which commits are in this PR; I will have to reset again. I wish I could figure out that this will happen before I submit the PR. ------------------------------ You can view, comment on, or merge this pull request online at: #206 Commit Summary - fixes in documentation; changed links to point to the released spec - Merge remote-tracking branch 'upstream/master' - Improved EBPF documentation - Cropped image - Merge remote-tracking branch 'upstream/master' - Fix for issue #166: spec changed for header stacks File Changes - *M* frontends/common/constantFolding.cpp <https://github.com/p4lang/p4c/pull/206/files#diff-0> (54) - *M* frontends/p4/simplifyDefUse.cpp <https://github.com/p4lang/p4c/pull/206/files#diff-1> (7) - *M* frontends/p4/typeChecking/typeChecker.cpp <https://github.com/p4lang/p4c/pull/206/files#diff-2> (11) - *M* ir/type.cpp <https://github.com/p4lang/p4c/pull/206/files#diff-3> (4) - *M* ir/type.def <https://github.com/p4lang/p4c/pull/206/files#diff-4> (4) - *A* testdata/p4_16_errors/stack2.p4 <https://github.com/p4lang/p4c/pull/206/files#diff-5> (28) - *A* testdata/p4_16_errors_outputs/stack2.p4 <https://github.com/p4lang/p4c/pull/206/files#diff-6> (13) - *A* testdata/p4_16_errors_outputs/stack2.p4-stderr <https://github.com/p4lang/p4c/pull/206/files#diff-7> (15) - *M* testdata/p4_16_samples/stack.p4 <https://github.com/p4lang/p4c/pull/206/files#diff-8> (2) - *M* testdata/p4_16_samples_outputs/stack-first.p4 <https://github.com/p4lang/p4c/pull/206/files#diff-9> (2) - *M* testdata/p4_16_samples_outputs/stack.p4 <https://github.com/p4lang/p4c/pull/206/files#diff-10> (2) Patch Links: - https://github.com/p4lang/p4c/pull/206.patch - https://github.com/p4lang/p4c/pull/206.diff — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#206>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABwi0hLZygDf1vpB_DUPd9MqJT8rEcosks5rKvjRgaJpZM4LUbf6> .

[mihaibudiu]

What is the recommended git command to do that? I have tried various versions of rebase with no success so far.