Cannot land CL 2746583003 |
|||||
Issue descriptionI've been trying to land https://codereview.chromium.org/2746583003 for a couple days and it just won't go. No idea if it's relevant, but I've been getting "command line too long" when I try to "git cl upload" it, which I've been working around by passing --bypass-hooks. I tried landed the CL via "git cl land" and got this: error: unpack failed: error duplicateEntries: object 90f1a89a3cb405f1f061d77d118f186c11a7dba5: duplicate entry names error: failed to push some refs to 'https://chromium.googlesource.com/chromium/src.git' To https://chromium.googlesource.com/chromium/src.git ! HEAD:refs/heads/master [remote rejected] (n/a (unpacker error))
,
Apr 27 2017
,
Apr 27 2017
You have a corrupted commit object in your local repository. I'd advise trying this: $ cd chromium/src $ git new-branch try-land $ git cl patch --rietveld 2746583003 $ git cl land By downloading the patch from rietveld into a clean branch, you will be generating a new commit object that hopefully won't have whatever corruption is present in your current one. If that doesn't work, please assign this back to me with a full log of what happens when you run the commands above.
,
Apr 29 2017
Did not work. Here's the full output: C:\src\chrome\src\out\clang>git new-branch gradients-temp2 Switched to branch gradients-temp2. C:\src\chrome\src\out\clang>git cl patch --rietveld 2746583003 Committed patch locally. C:\src\chrome\src\out\clang>git cl land Using 50% similarity for rename/copy detection. Override with --similarity. Running presubmit commit checks ... ** Presubmit Messages ** --tbr was specified, skipping OWNERS check --tbr was specified, skipping OWNERS check --tbr was specified, skipping OWNERS check Presubmit checks took 21.5s to calculate. Presubmit checks passed. Description: Send deprecation messages for prefixed gradients now that it's possible. R=japhet@chromium.org, schenney@chromium.org, suzyh@chromium.org BUG= 668251 Review-Url: https://codereview.chromium.org/2746583003 . .../reflections/empty-reflection-with-mask.html | 2 +- .../masked-reflection-on-composited-huge.html | 3 +- .../masked-reflection-on-composited.html | 3 +- .../reflections/nested-reflection-mask-change.html | 2 +- .../calc/reflection-computed-style-expected.txt | 4 +- .../css3/calc/reflection-computed-style.html | 4 +- .../background-fill-zero-area-crash.html | 8 +- .../body-generated-image-propagated-to-root.html | 2 +- .../backgrounds/gradient-background-leakage-2.html | 2 +- .../gradient-background-leakage-hidpi.html | 2 +- .../backgrounds/gradient-background-leakage.html | 2 +- .../size/contain-and-cover-expected.png | Bin 340280 -> 341117 bytes .../size/contain-and-cover-zoomed-expected.png | Bin 162597 -> 163901 bytes .../backgrounds/size/contain-and-cover-zoomed.html | 2 +- .../fast/backgrounds/size/contain-and-cover.html | 2 +- .../border-image-reset-by-border-shorthand.html | 2 +- .../fast/borders/border-image-scaled-gradient.html | 2 +- .../fast/borders/border-image-trumps-radius.html | 2 +- .../border-radius-mask-canvas-with-mask.html | 2 +- ...ash-on-gradient-with-derived-color-expected.txt | 1 + .../computed-style-cross-fade-expected.txt | 2 +- .../computed-style-cross-fade.html | 2 +- .../getComputedStyle-border-image-expected.txt | 16 ++-- .../getComputedStyle-border-image.html | 16 ++-- .../css/linear-gradient-currentcolor-expected.txt | 1 + .../fast/css/number-parsing-crash-expected.txt | 1 + .../LayoutTests/fast/css/transformed-mask.html | 2 +- .../forms/type-after-focus-rule-shrink-width.html | 2 +- .../fast/gradients/background-clipped-expected.png | Bin 37776 -> 38887 bytes .../fast/gradients/background-clipped.html | 2 +- .../gradients/border-image-gradient-expected.txt | 1 + ...r-image-gradient-sides-and-corners-expected.txt | 1 + .../border-image-gradient-sides-and-corners.html | 2 +- .../gradients/crash-on-1px-border-expected.txt | 1 + .../crash-on-degenerate-gradient-expected.txt | 1 + .../gradients/crash-on-degenerate-gradient.html | 1 + .../fast/gradients/crash-on-remove-expected.txt | 1 + .../fast/gradients/crash-on-tr-expected.txt | 1 + .../fast/gradients/css3-color-stop-units.html | 24 ++---- .../fast/gradients/css3-color-stops.html | 27 ++---- .../gradients/css3-gradient-parsing-expected.txt | 96 +++++++++++---------- .../fast/gradients/css3-gradient-parsing.html | 80 ++++++++--------- .../css3-linear-angle-gradients-expected.png | Bin 16818 -> 0 bytes .../gradients/css3-linear-angle-gradients.html | 27 ++---- .../css3-linear-right-angle-gradients.html | 32 +++---- .../css3-radial-gradient-crash-expected.txt | 1 + .../fast/gradients/css3-radial-gradients.html | 27 ++---- .../fast/gradients/css3-radial-gradients2.html | 18 ++-- .../fast/gradients/css3-radial-gradients3.html | 6 +- .../fast/gradients/css3-repeating-end-fill.html | 6 +- .../css3-repeating-linear-gradients-expected.png | Bin 8203 -> 0 bytes .../gradients/css3-repeating-linear-gradients.html | 27 ++---- .../css3-repeating-linear-gradients2.html | 3 +- .../gradients/css3-repeating-radial-gradients.html | 27 ++---- .../gradient-after-transparent-border.html | 2 +- .../gradient-on-pseudoelement-crash-expected.txt | 1 + .../fast/gradients/list-item-gradient.html | 4 +- ...zero-range-repeating-gradient-hang-expected.txt | 1 + .../fast/hidpi/gradient-with-scaled-ancestor.html | 2 +- .../reflection-computed-style-expected.txt | 4 +- .../reflections/reflection-computed-style.html | 4 +- .../fast/reflections/reflection-masks.html | 2 +- .../fast/reflections/reflection-with-zoom.html | 2 +- .../images/color-profile-reflection.html | 3 +- .../paint/invalidation/background-generated.html | 2 +- ...shorthand-with-gradient-and-height-changes.html | 6 +- ...size-auto-with-gradient-and-height-changes.html | 7 +- .../invalidation/gradients-em-stops-repaint.html | 3 +- .../border-image-scaled-gradient-expected.png | Bin 0 -> 8505 bytes .../border-image-scaled-gradient-expected.txt | 6 ++ .../gradients/crash-on-zero-radius-expected.txt | 1 + .../css3-linear-angle-gradients-expected.png | Bin 16696 -> 0 bytes .../css3-repeating-linear-gradients-expected.png | Bin 8203 -> 0 bytes .../gradients/generated-gradients-expected.txt | 1 + .../fast/gradients/list-item-gradient-expected.png | Bin 6240 -> 6362 bytes .../fast/gradients/radial-centered-expected.txt | 1 + .../fast/gradients/simple-gradients-expected.txt | 1 + .../border-image-scaled-gradient-expected.png | Bin 8550 -> 0 bytes .../gradients/crash-on-zero-radius-expected.txt | 1 + .../css3-linear-angle-gradients-expected.png | Bin 0 -> 15402 bytes .../css3-repeating-linear-gradients-expected.png | Bin 0 -> 7486 bytes .../gradients/generated-gradients-expected.txt | 1 + .../fast/gradients/list-item-gradient-expected.png | Bin 3593 -> 3711 bytes .../fast/gradients/radial-centered-expected.txt | 1 + .../fast/gradients/simple-gradients-expected.txt | 1 + .../border-image-scaled-gradient-expected.png | Bin 8546 -> 0 bytes .../gradients/crash-on-zero-radius-expected.txt | 1 + .../css3-linear-angle-gradients-expected.png | Bin 16696 -> 15316 bytes .../css3-linear-angle-gradients-expected.txt | 3 - .../css3-repeating-linear-gradients-expected.png | Bin 8203 -> 7486 bytes .../css3-repeating-linear-gradients-expected.txt | 3 - .../gradients/generated-gradients-expected.txt | 1 + .../fast/gradients/list-item-gradient-expected.png | Bin 3642 -> 3741 bytes .../fast/gradients/radial-centered-expected.txt | 1 + .../fast/gradients/simple-gradients-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 1 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../svg/zoom/page/zoom-background-images.html | 2 +- .../core/css/parser/CSSPropertyParserHelpers.cpp | 16 ++-- .../WebKit/Source/core/frame/Deprecation.cpp | 18 ++++ .../border-image-scaled-gradient-expected.png | Bin 0 -> 8505 bytes .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + .../scrollbar-gradient-crash-expected.txt | 2 + .../scrollbar-percent-padding-crash-expected.txt | 1 + 133 files changed, 337 insertions(+), 317 deletions(-) Attempt 1 of 3 Fetching origin/refs/heads/master... From https://chromium.googlesource.com/chromium/src * [new branch] master -> git-cl-cherry-pick 4ffc942..66fbe94 master -> origin/master Cherry-picking commit on top of latest refs/heads/master Counting objects: 144, done. Delta compression using up to 48 threads. Compressing objects: 100% (132/132), done. Writing objects: 100% (144/144), 580.51 KiB | 0 bytes/s, done. Total 144 (delta 107), reused 11 (delta 8) error: unpack failed: error duplicateEntries: object 4fa330a0e86c60b25a5306fff3b174e98858d5b3: duplicate entry names error: failed to push some refs to 'https://chromium.googlesource.com/chromium/src.git' To https://chromium.googlesource.com/chromium/src.git ! HEAD:refs/heads/master [remote rejected] (n/a (unpacker error)) Done Attempt 2 of 3 Fetching origin/refs/heads/master... Cherry-picking commit on top of latest refs/heads/master Counting objects: 144, done. Delta compression using up to 48 threads. Compressing objects: 100% (132/132), done. Writing objects: 100% (144/144), 580.51 KiB | 0 bytes/s, done. Total 144 (delta 107), reused 11 (delta 8) error: unpack failed: error duplicateEntries: object 4fa330a0e86c60b25a5306fff3b174e98858d5b3: duplicate entry names error: failed to push some refs to 'https://chromium.googlesource.com/chromium/src.git' To https://chromium.googlesource.com/chromium/src.git ! HEAD:refs/heads/master [remote rejected] (n/a (unpacker error)) Done Attempt 3 of 3 Fetching origin/refs/heads/master... Cherry-picking commit on top of latest refs/heads/master Counting objects: 144, done. Delta compression using up to 48 threads. Compressing objects: 100% (132/132), done. Writing objects: 100% (144/144), 580.51 KiB | 0 bytes/s, done. Total 144 (delta 107), reused 11 (delta 8) error: unpack failed: error duplicateEntries: object 4fa330a0e86c60b25a5306fff3b174e98858d5b3: duplicate entry names error: failed to push some refs to 'https://chromium.googlesource.com/chromium/src.git' To https://chromium.googlesource.com/chromium/src.git ! HEAD:refs/heads/master [remote rejected] (n/a (unpacker error)) Done Failed to push. If this persists, please file a bug.
,
May 1 2017
Wow, yeah, I replicate the exact same behavior. I'm running a git fsck now (really slow on a repo this big) to see if it turns anything up.
,
May 1 2017
The error seems to be pointing at Git somehow having arrived in a state where it has two objects with the same filename and path from the root of the repo. However, I can't find any evidence of that using "git fsck" or "git ls-files" and some sort/uniq shenanigans. It appears that only JGit believes there are duplicate entries, my local git disagrees. Investigating futher.
,
May 1 2017
Got some folks to help investigate in b/37868141. The problem is in your patch. You have a bunch of files in the directory "third_party/webkit", and a bunch of files in the directory "third_party/WebKit". This works fine on linux (which is why my `git fsck` wasn't complaining), but doesn't work on case-insensitive filesystems like MacOS uses. All of the files under the "third_party/webkit" path need to be moved to the canonical "third_party/WebKit" path instead. If you know how you got into this state, it's possible we can make changes to tooling to help prevent it from happening again in the future, but this is back in your court.
,
May 3 2017
Simply resetting and recommitting the patch fixed the issue (I'm on Windows) and now it's finally been landed. Thanks for the help! As for how I got in that state in the first place, I used webkit-patch rebaseline-cl to generate those new files, so maybe there's something wrong there? |
|||||
►
Sign in to add a comment |
|||||
Comment 1 by dpranke@chromium.org
, Apr 27 2017