Bug 241731 - `git webkit pr` says I have unstaged changes
Summary: `git webkit pr` says I have unstaged changes
Status: NEW
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: Safari Technology Preview
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
Keywords: InRadar
Depends on:
Blocks: 239082
  Show dependency treegraph
Reported: 2022-06-17 16:13 PDT by Simon Fraser (smfr)
Modified: 2022-06-24 16:14 PDT (History)
3 users (show)

See Also:


Note You need to log in before you can comment on or make changes to this bug.
Description Simon Fraser (smfr) 2022-06-17 16:13:13 PDT
OpenSource % git webkit pr --issue 241730
Switched to a new branch 'eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in'
Created the local development branch 'eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in'
Branch 'main' set up to track remote branch 'main' from 'origin'.
  Running status to find changed, added, or removed files.
  Reviewing diff to determine which lines changed.
  Extracting affected function names from source files.
  Change author: Simon Fraser <simon.fraser@apple.com>.
[eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in 70096fa91fbc] IntersectionObserver stops tracking when cmd+ is used to zoom in https://bugs.webkit.org/show_bug.cgi?id=241730
 Date: Fri Jun 17 16:06:07 2022 -0700
 3 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 LayoutTests/intersection-observer/root-margin-percentage-units-with-zoom-expected.txt
 create mode 100644 LayoutTests/intersection-observer/root-margin-percentage-units-with-zoom.html
remote: Enumerating objects: 217, done.
remote: Counting objects: 100% (212/212), done.
remote: Compressing objects: 100% (126/126), done.
remote: Total 217 (delta 97), reused 190 (delta 85), pack-reused 5
Receiving objects: 100% (217/217), 773.59 KiB | 3.31 MiB/s, done.
Resolving deltas: 100% (99/99), completed with 38 local objects.
From https://github.com/WebKit/WebKit
   ae412c0c44ff..43ae82f9ba1a  main       -> main
   ae412c0c44ff..43ae82f9ba1a  main       -> origin/main
From https://github.com/WebKit/WebKit
 * branch                      main       -> FETCH_HEAD
Successfully rebased and updated refs/heads/eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in.
Cannot rewrite branches: You have unstaged changes.
Failed to rebase 'eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in' on 'main,' please resolve conflicts
Comment 1 Simon Fraser (smfr) 2022-06-17 16:16:43 PDT
I ended up with a good commit on the branch:

OpenSource % git log
commit 4384c4af75c56f4947ae20553c7a61389a01f499 (HEAD -> eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in)
Author: Simon Fraser <simon.fraser@apple.com>
Date:   Fri Jun 17 16:06:07 2022 -0700

and I'm up-to-date with main:
OpenSource % git rebase main
Current branch eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in is up to date.
Comment 2 Radar WebKit Bug Importer 2022-06-24 16:14:12 PDT