New issue
Advanced search Search tips

Issue 630822 link

Starred by 2 users

Issue metadata

Status: Available
Owner: ----
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Feature



Sign in to add a comment

"git cl upload" uploads frozen changes

Reported by techtonik@gmail.com, Jul 23 2016

Issue description

"git cl upload" uploads frozen changesets - it should upload or warn about them.

https://codereview.chromium.org/2157763002/ ???

I did this:

1. git new-branch selfless --upstream-current
2. git checkout maphelp
3. git rebase -i HEAD~4  # stripping last commit in maphelp
4. git freeze   # freeze changes
5. git cl upload -s

 

Comment 1 by no...@chromium.org, Jul 23 2016

Labels: -Restrict-View-Google

Comment 2 by estaab@chromium.org, Jul 25 2016

Components: -Infra Infra>SDK
Labels: Pri-1 Type-Bug
Labels: -Pri-1 Pri-2
Status: Available (was: Untriaged)

Comment 5 by techtonik@gmail.com, Aug 17 2016

s/should upload/should not upload/
Labels: -Type-Bug -Pri-2 Pri-3 Type-Feature
IMO, WAI. both tools did their job.

Why do you run git cl upload on a branch with bad changes?
That said, I'm for adding a warning in "git cl upload" in case HEAD's commit message is from git freeze. I'm happy to review a patch with tests.

Comment 7 by techtonik@gmail.com, Aug 18 2016

I look at freeze as a branch specific stash that puts advanced WIP away while there are more simple bits in the branch waiting to be reviewed first. It is not intended to be used like this?

Comment 8 by techtonik@gmail.com, Mar 29 2017

I once again run `git freeze`, because I had uncommitted changes and `cl upload` told me to do this. Not there is also a security issue with that, because now all my uncommitted files and notes are exposed - see patchset #5 - https://codereview.chromium.org/2157763002/#ps80001

Comment 9 by iannu...@google.com, Mar 30 2017

Hm... 'upload' is designed to upload the branch. Freeze commits the changes to the current branch.

I suppose we could make upload attempt to detect the commits created by freeze, but I agree with comment #6, this is a feature request, not a bug.
Ah, I see, this is hitting the generic 'dirty tree' error check in git-cl. The advice is to 'commit, freeze, or stash' your changes before uploading. How did you decide to freeze them, as opposed to stashing them, or moving them to a different branch?
I chose to freeze, because the idea of branch-local stash seems awesome to me. Moving to different branch was not chosen, because it is a complicated operation that is missing from https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html cookbook.
And also when I commit changes in the middle of working session for review I don't have time to sort out all the different bugs and notes scattered over the table into their branches. Cleanup is something that needs to be done later.
Project Member

Comment 13 by sheriffbot@chromium.org, Apr 12 2018

Labels: Hotlist-Recharge-Cold
Status: Untriaged (was: Available)
This issue has been Available for over a year. If it's no longer important or seems unlikely to be fixed, please consider closing it out. If it is important, please re-triage the issue.

Sorry for the inconvenience if the bug really should have been left as Available.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
No time to check as I don't use `git cl` anymore.
Status: Available (was: Untriaged)

Sign in to add a comment