| commit | a2e91c48facd8d204b27a1f577c75ca404cbbfe8 | [log] [tgz] |
|---|---|---|
| author | Douglas Anderson <[email protected]> | Fri Aug 21 15:46:09 2020 |
| committer | Commit Bot <[email protected]> | Fri Aug 21 16:37:07 2020 |
| tree | a4766e3da61dc285076138e2e8b81b7860f90887 | |
| parent | 0014818a2e64c730130ab51cd21865e20ab2f5d9 [diff] |
Revert "fromupstream: use --reject for git-apply" This reverts commit 3a4ebdaa6e0d7aefdc25765d473e09979c554bc3. When trying to apply a patch that cleanly applies, I'm now getting errors. Removing the "--reject" flag fixes it. Example: fromupstream.py -b=b:161373813 -t="None" pw://lkml/1293172 As per git documentation, "--reject" is incompatible with "-3" and I think we want "-3" more (if nothing else because that's what we've historically had). If someone needs "--reject" I suppose we could add another option... BUG=None TEST=fromupstream.py -b=b:161373813 -t="None" pw://lkml/1293172 Change-Id: I8261da243b145d2993ca53a813b3216d837ad5ec Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2369145 Commit-Queue: Douglas Anderson <[email protected]> Tested-by: Douglas Anderson <[email protected]> Reviewed-by: Brian Norris <[email protected]>