New issue
Advanced search Search tips

Issue 842736 link

Starred by 2 users
Status: Available
Owner: ----
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Bug



Sign in to add a comment

git cl upload allows non-rebased commit to upload?

Project Member Reported by whesse@google.com, May 14 2018 
A user report to me indicated that he was able to upload a dependent CL that had not been rebased on its upstream.  The upload then included the undo of the change that was landed on the upstream, but not merged (rebased) into the branch.

Does this sound like it could have happened, and if so, is it intended behavior?  It seems like it would always be an error to upload the difference between a branch and its upstream, if its upstream is not an ancestor.

I am assuming it is the git cl upload command that allows this, and should have the check, which is why the bug is filed against depot_tools.

Comment 1 by whesse@google.com, May 14 2018 

I have reproduced the claimed bug, and see that if a is upstream of b, then running git cl upload on b with the following tree:

x --bb--> b
 \
  --aa--> a 

will upload the change that is the inverse of diff aa, plus diff bb.

This does seem like it should give a warning instead.
If this is a known case, and working-as-intended, then OK, I just wanted to check.

Comment 2 by ajp@chromium.org, Dec 13

Status: Available (was: Untriaged)
►

Sign in to add a comment