Skip to content

Commit ed3f1f0

Browse files
committed
feat(reword): change reword default revset to stack() | @
My justification from Discord https://discord.com/channels/915309546984050709/915309546984050712/1058219879850848276: > For me, it's usually not a problem to see multiple commit messages; the default being stack() means that I have access to more functionality by default; it would be a good way to introduce the user to that functionality; it matches git submit's default revset, and I usually git reword beforehand
1 parent 601f959 commit ed3f1f0

File tree

2 files changed

+8
-9
lines changed
  • git-branchless-opts/src
  • git-branchless-reword/src

2 files changed

+8
-9
lines changed

git-branchless-opts/src/lib.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,13 @@ pub enum Command {
455455

456456
/// Reword commits.
457457
Reword {
458-
/// Zero or more commits to reword. If not provided, defaults to "HEAD".
459-
#[clap(value_parser)]
458+
/// Zero or more commits to reword.
459+
#[clap(
460+
value_parser,
461+
default_value = "stack() | @",
462+
default_value_if("commit_to_fixup", clap::builder::ArgPredicate::IsPresent, "@"),
463+
default_value_if("messages", clap::builder::ArgPredicate::IsPresent, "@")
464+
)]
460465
revsets: Vec<Revset>,
461466

462467
/// Options for resolving revset expressions.

git-branchless-reword/src/lib.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,13 +325,7 @@ fn resolve_commits_from_hashes<'repo>(
325325
revsets: Vec<Revset>,
326326
resolve_revset_options: &ResolveRevsetOptions,
327327
) -> eyre::Result<Option<Vec<Commit<'repo>>>> {
328-
let hashes = if revsets.is_empty() {
329-
vec![Revset("HEAD".to_string())]
330-
} else {
331-
revsets
332-
};
333-
334-
let commit_sets = match resolve_commits(effects, repo, dag, &hashes, resolve_revset_options) {
328+
let commit_sets = match resolve_commits(effects, repo, dag, &revsets, resolve_revset_options) {
335329
Ok(commit_sets) => commit_sets,
336330
Err(err) => {
337331
err.describe(effects)?;

0 commit comments

Comments
 (0)