Skip to content

[Ellipsis] Let the user modify the prompt #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ellipsis-dev wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[Ellipsis] Let the user modify the prompt #3

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d08de30
implement #2;
ellipsis-dev[bot] May 14, 2024
21900ba
address comments left by @marissamarym on #3 ([Ellipsis] Let the user…
ellipsis-dev[bot] May 14, 2024
20fd9e5
address comments left by @marissamarym on #3 ([Ellipsis] Let the user…
ellipsis-dev[bot] May 14, 2024
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
10 changes: 9 additions & 1 deletion src/commitm.zsh
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ show_help() {
echo " -np, --no-prefix Clear the prefix for the generated message."
echo " -q, --quiet Suppress all output."
echo " -v Show the current version."
echo " -pr, --prompt Set a custom prompt for the commit message."
}

show_version() {
Expand Down Expand Up @@ -43,6 +44,7 @@ commitm() {
local cleaned_up=false
local length_level=0
local is_bot_generated=true
local prompt=""

# Command line argument validation
local is_prefix_set=false
Expand All @@ -68,6 +70,12 @@ commitm() {
prev_arg=""
continue
fi
if [[ "$prev_arg" == "--prompt" ]] || [[ "$prev_arg" == "-pr" ]]; then
prompt="$arg"
# Reset prev_arg
prev_arg=""
continue
fi
prev_arg="$arg"

if [[ "$arg" == "--execute" ]] || [[ "$arg" == "-e" ]]; then
Expand Down Expand Up @@ -147,7 +155,7 @@ commitm() {
local git_changes=$(cat "$git_output_temp_file")

# Prepare the system prompt with modifications and git changes
local full_system_prompt="$system_prompt$prompt_mod"
local full_system_prompt="$system_prompt$prompt_mod$prompt"
Copy link
Owner

@marissamarym marissamarym May 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ellipsis-dev it should replace the default prompt, not add onto it.

if the user specifies a custom prompt, you may need to add some text at the end to incorporate the prompt mod.

please fix

Copy link
Author

@ellipsis-dev ellipsis-dev bot May 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marissamarym, I have addressed your comments in commit 20fd9e5

You can configure Ellipsis to address comments with a direct commit or a side PR, see docs.

local git_changes_formatted="$git_changes"


Expand Down