This message was deleted.

Hah, related to https://graphite-community.slack.com/archives/C02DRNRA9RA/p1694686478081849

Yeah, I’ve been using this alias for a few months:

alias gts='gt repo sync && gt stack restack && gt stack submit'

with an optional

checkout main

beforehand to pull in all the stacks.

gt repo sync

got an optional

--restack

flag recently, and now with v1

gt sync

auto-restacks by default, which is nice. The new command of

gt sync; gt s

is manageable as long as it works from main, but I’d love a proper CLI command to do all bulk

with the 1.0.1 fix,

gt submit --stack

(

gt ss

) from trunk should do everything — let me know if you encounter anything unexpected

1.0.1 that you just released!? wow!! 👏

wake up > make 50 line change > test somewhat > release (benefits of working at a startup)

That said, I do encounter something unexpected:

$ git ss
🥞 Validating that this Graphite stack is ready to submit...
ERROR: Command failed with error exit code 129:
git merge-tree 052fbba9117e73e4dd0829e2306a110ba88e2671 c3efeb440040dcee0bcf91e5ef88eccb6daf7399

usage: git merge-tree <base-tree> <branch1> <branch2>

let me know if there are any bugs

Ah

i need to add an explicit check for this, should just do in another quick fix tbh

Yes as you depend on a Git version that is not in the latest Ubuntu long-term-support release you will have users encountering this 👍

things like this are why I haven't sent out the upgrade notification yet! thanks for being an early upgrader 🙂

The fix for Ubuntu users is super easy by the way as the Git developers maintain an official repo:

sudo add-apt-repository ppa:git-core/ppa; sudo apt update; sudo apt install git

awesome, i'll add that to the upgrade page!

Does the new

gt ss

pull, sync, restack, and submit?

the current behavior is to only pull if we need to, i.e. if sync deletes merged branches

It does, but it warns me that it can't restack my trunk branch (which is up-to-date)

Can you share a screenshot of the output?

I can do that in 15 minutes

We should be printing out only the exact branches that conflict in that message

If I want to pull the latest trunk and restack everything, I still need to run

gt sync

first?

that's the current behavior yes. we're getting quite close to the point where you don't need to run it at all, but it will take a little bit more work I think. based on this conversation, considering adding a flag to submit to always pull