Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/demo.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions assets/demo.tape
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Set Shell fish
Hide
Type "cd $(mktemp -d -t git-squad.XXXX)"
Enter
Type "mv ~/.config/git-squad/buddies.yaml ~/.config/git-squad/buddies.yaml.bup"
Type "mv ~/.config/git-squad/buddies.toml ~/.config/git-squad/buddies.toml.bup"
Enter
Type "git-squad alone"
Enter
Expand Down Expand Up @@ -83,7 +83,7 @@ Sleep 500ms
Type "git commit"
Enter
Escape
Type "O"
Type "i"
Type "work on file with peter and wendy"
Escape
Sleep 500ms
Expand All @@ -95,7 +95,8 @@ Enter
Sleep 5s

Hide
Type "mv ~/.config/git-squad/buddies.yaml.bup ~/.config/git-squad/buddies.yaml"
Type "mv ~/.config/git-squad/buddies.toml.bup ~/.config/git-squad/buddies.toml"
Enter
Type "git-squad alone"
Enter
Sleep 3s
6 changes: 1 addition & 5 deletions src/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,7 @@ pub fn update_commit_template(active_buddies: &Buddies) -> Result<()> {

// Add our section with co-authors if needed
if !active_buddies.buddies.is_empty() {
if !new_content.is_empty() {
new_content.push('\n');
}

new_content.push('\n');
new_content.push_str("\n\n");
new_content.push_str(BEGIN_MARKER);
new_content.push('\n');

Expand Down