Comments (4)
The case for --3way
makes sense to me.
Regarding passing arbitrary options to git apply
, I personally do not prefer that approach. Stgit has this kind of arbitrary option pass-through with --diff-opts
on several subcommands (diff
, show
, edit
, ...).
One of the problems is CLI discoverability. Stgit's help does not present the user with all the valid/useful diff options. This could be solved with more documentation.
Another problem is that it becomes unclear/opaque as to how user-selected diff options interact with stgit's default diff options. I.e. how does the user know which ones stgit already applies? Or what the behavior will be when a user-provided option conflicts with a stgit default option?
Lastly, it makes the stgit code more complex because in order to have reasonable behaviors when a user-provided option conflicts with stgit's default option set, stgit has to first parse the user's pass-through options and then resolve the conflict somehow. At this point, we are already baking-in knowledge about git
's options, so why not explicitly enumerate the useful options as part of stgit's interface?
Anyway, I would be open to a patch to add the --3way
option to stg import
, along with potentially other options that map to useful git apply
modes/options, but I'd need to be sold on the general-purpose pass-through.
from stgit.
OK, I wasn't sure if there would be pushback to a parade of new options, but I can route a --3way option for now and leave something more generic/powerful for another day.
Thank you and sorry for the deluge of issues/emails; but I am very excited to see activity on stgit, which is a tool I love dearly :)
from stgit.
Another option that I'd be interested in from git-apply
is --directory
.
The repository I'm importing to doesn't have the same base path as the repository I'm importing from. I'm ok that the generated patches would have different paths. Having this option would help bootstrap the process using stgit
instead of manually using git am
and git apply
.
from stgit.
Trying to backport https://patchwork.kernel.org/project/linux-pci/cover/[email protected]/ on older kernel, I was reminded stg import --3way
sure would be nice.
from stgit.
Related Issues (20)
- Auto-`pop` a chain of patches to avoid merge conflicts HOT 1
- Non-stacky `pop`/`push` HOT 2
- "stg email" is very different than "stg mail" HOT 1
- stgit not finding user information HOT 3
- stg status: error: while expanding shell alias (program not found) HOT 1
- error: running editor: vi: The system cannot find the file specified. (os error 2)
- "stg pop --spill" leaves patch modifications staged HOT 1
- "new, pop, edit, refresh, push" results in empty top patch? HOT 5
- "stg branch some_other_branch --delete" deletes _current_ branch HOT 1
- Argv ordering requirements unnecessarily strict HOT 5
- FR: `swap` command for reordering patches - keeping tree contents the same at each HOT 3
- Question about stg edit
- stg mail --compose is not setting In-Reply-To or Reference from the cover letter.
- stg mail send with multiple --cc options only honors the first HOT 2
- feature request: stg whatchanged HOT 2
- feature request: stg move HOT 1
- Refresh installation documentation on https://stacked-git.github.io/ HOT 2
- [feature request]: run command on each (applied) patch HOT 3
- Renaming a commit as part of `stg refresh -e` ignores changes to the body HOT 1
- "stg import --reject" is broken
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from stgit.