Skip to content

Commit

Permalink
jj git push docs: document safety checks
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyagr committed May 15, 2024
1 parent 894cbc3 commit 66768ff
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 0 deletions.
24 changes: 24 additions & 0 deletions cli/src/commands/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,30 @@ pub struct GitCloneArgs {
/// `remote_branches(remote=<remote>)..@`. Use `--branch` to push specific
/// branches. Use `--all` to push all branches. Use `--change` to generate
/// branch names based on the change IDs of specific commits.
///
/// Before the command actually moves or creates a remote branch, it makes
/// several safety checks.
///
/// 1. `jj` will contact the remote and check that the actual state of the
/// remote branch matches `jj`'s record of its last known position. If they
/// do not match, `jj` will refuse to push the branch. In this case, you need
/// to `jj git fetch --remote <remote name>`. This may create some branch
/// conflicts, which you'll need to resolve before trying `jj git push`
/// again.
///
/// If you are familiar with Git, this makes `jj git push` similar to `git
/// push --force-with-lease`.
///
/// 2. The local branch must not be [conflicted]. If it is, you would need to
/// use `jj branch set`, for example, to resolve the conflict.
///
/// 3. If the remote branch already exists on the remote, it must be [tracked].
/// If it does not already exist on the remote, `jj git push` will create the
/// branch and mark it as tracked.
///
/// [conflicted]: https://martinvonz.github.io/jj/latest/branches/#conflicts
/// [tracked]: https://martinvonz.github.io/jj/latest/branches/#remotes-and-tracked-branches
#[derive(clap::Args, Clone, Debug)]
#[command(group(ArgGroup::new("specific").args(&["branch", "change", "revisions"]).multiple(true)))]
#[command(group(ArgGroup::new("what").args(&["all", "deleted", "tracked"]).conflicts_with("specific")))]
Expand Down
12 changes: 12 additions & 0 deletions cli/tests/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,18 @@ Push to a Git remote
By default, pushes any branches pointing to `remote_branches(remote=<remote>)..@`. Use `--branch` to push specific branches. Use `--all` to push all branches. Use `--change` to generate branch names based on the change IDs of specific commits.
Before the command actually moves or creates a remote branch, it makes several safety checks.
1. `jj` will contact the remote and check that the actual state of the remote branch matches `jj`'s record of its last known position. If they do not match, `jj` will refuse to push the branch. In this case, you need to `jj git fetch --remote <remote name>`. This may create some branch conflicts, which you'll need to resolve before trying `jj git push` again.
If you are familiar with Git, this makes `jj git push` similar to `git push --force-with-lease`.
2. The local branch must not be [conflicted]. If it is, you would need to use `jj branch set`, for example, to resolve the conflict.
3. If the remote branch already exists on the remote, it must be [tracked]. If it does not already exist on the remote, `jj git push` will create the branch and mark it as tracked.
[conflicted]: https://martinvonz.github.io/jj/latest/branches/#conflicts [tracked]: https://martinvonz.github.io/jj/latest/branches/#remotes-and-tracked-branches
**Usage:** `jj git push [OPTIONS]`
###### **Options:**
Expand Down

0 comments on commit 66768ff

Please sign in to comment.