undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am: replace uses of --resolved with --continue

Browse Source 
git am was previously modified to provide --continue for consistency
with rebase, merge etc, and the documentation changed to showing
--continue as the primary form.

Complete the work by replacing remaining uses of --resolved by
--continue, most notably in suggested command reminders.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kevin Bracey 2013-06-26 23:06:41 +03:00 committed by Junio C Hamano
parent 85318f521f
commit 8ceb6fbd63
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-am.txt
View File

@ -132,7 +132,7 @@ default. You can use `--no-utf8` to override this.
--resolvemsg=<msg>:: --resolvemsg=<msg>::
When a patch failure occurs, <msg> will be printed When a patch failure occurs, <msg> will be printed
to the screen before exiting. This overrides the to the screen before exiting. This overrides the
standard message informing you to use `--resolved` standard message informing you to use `--continue`
or `--skip` to handle the failure. This is solely or `--skip` to handle the failure. This is solely
for internal use between 'git rebase' and 'git am'. for internal use between 'git rebase' and 'git am'.
@ -176,7 +176,7 @@ aborts in the middle. You can recover from this in one of two ways:
. hand resolve the conflict in the working directory, and update . hand resolve the conflict in the working directory, and update
the index file to bring it into a state that the patch should the index file to bring it into a state that the patch should
have produced. Then run the command with the '--resolved' option. have produced. Then run the command with the '--continue' option.
The command refuses to process new mailboxes until the current The command refuses to process new mailboxes until the current
operation is finished, so if you decide to start over from scratch, operation is finished, so if you decide to start over from scratch,

2
Documentation/user-manual.txt
View File

@ -1835,7 +1835,7 @@ Once the index is updated with the results of the conflict
resolution, instead of creating a new commit, just run resolution, instead of creating a new commit, just run
------------------------------------------------- -------------------------------------------------
$ git am --resolved $ git am --continue
------------------------------------------------- -------------------------------------------------
and Git will create the commit for you and continue applying the and Git will create the commit for you and continue applying the

8
git-am.sh
View File

@ -6,7 +6,7 @@ SUBDIRECTORY_OK=Yes
OPTIONS_KEEPDASHDASH= OPTIONS_KEEPDASHDASH=
OPTIONS_SPEC="\ OPTIONS_SPEC="\
git am [options] [(<mbox>|<Maildir>)...] git am [options] [(<mbox>|<Maildir>)...]
git am [options] (--resolved | --skip | --abort) git am [options] (--continue | --skip | --abort)
-- --
i,interactive run interactively i,interactive run interactively
b,binary* (historical option -- no-op) b,binary* (historical option -- no-op)
@ -102,7 +102,7 @@ stop_here_user_resolve () {
printf '%s\n' "$resolvemsg" printf '%s\n' "$resolvemsg"
stop_here $1 stop_here $1
fi fi
eval_gettextln "When you have resolved this problem, run \"\$cmdline --resolved\". eval_gettextln "When you have resolved this problem, run \"\$cmdline --continue\".
If you prefer to skip this patch, run \"\$cmdline --skip\" instead. If you prefer to skip this patch, run \"\$cmdline --skip\" instead.
To restore the original branch and stop patching, run \"\$cmdline --abort\"." To restore the original branch and stop patching, run \"\$cmdline --abort\"."
@ -523,7 +523,7 @@ Use \"git am --abort\" to remove it.")"
esac esac
fi fi
# Make sure we are not given --skip, --resolved, nor --abort # Make sure we are not given --skip, --continue, nor --abort
test "$skip$resolved$abort" = "" || test "$skip$resolved$abort" = "" ||
die "$(gettext "Resolve operation not in progress, we are not resuming.")" die "$(gettext "Resolve operation not in progress, we are not resuming.")"
@ -670,7 +670,7 @@ do
# - patch is the patch body. # - patch is the patch body.
# #
# When we are resuming, these files are either already prepared # When we are resuming, these files are either already prepared
# by the user, or the user can tell us to do so by --resolved flag. # by the user, or the user can tell us to do so by --continue flag.
case "$resume" in case "$resume" in
'') '')
if test -f "$dotest/rebasing" if test -f "$dotest/rebasing"

4
t/t7512-status-help.sh
View File

@ -510,7 +510,7 @@ test_expect_success 'status in an am session: file already exists' '
cat >expected <<-\EOF && cat >expected <<-\EOF &&
# On branch am_already_exists # On branch am_already_exists
# You are in the middle of an am session. # You are in the middle of an am session.
# (fix conflicts and then run "git am --resolved") # (fix conflicts and then run "git am --continue")
# (use "git am --skip" to skip this patch) # (use "git am --skip" to skip this patch)
# (use "git am --abort" to restore the original branch) # (use "git am --abort" to restore the original branch)
# #
@ -532,7 +532,7 @@ test_expect_success 'status in an am session: file does not exist' '
cat >expected <<-\EOF && cat >expected <<-\EOF &&
# On branch am_not_exists # On branch am_not_exists
# You are in the middle of an am session. # You are in the middle of an am session.
# (fix conflicts and then run "git am --resolved") # (fix conflicts and then run "git am --continue")
# (use "git am --skip" to skip this patch) # (use "git am --skip" to skip this patch)
# (use "git am --abort" to restore the original branch) # (use "git am --abort" to restore the original branch)
# #

2
wt-status.c
View File

@ -826,7 +826,7 @@ static void show_am_in_progress(struct wt_status *s,
if (advice_status_hints) { if (advice_status_hints) {
if (!state->am_empty_patch) if (!state->am_empty_patch)
status_printf_ln(s, color, status_printf_ln(s, color,
_(" (fix conflicts and then run \"git am --resolved\")")); _(" (fix conflicts and then run \"git am --continue\")"));
status_printf_ln(s, color, status_printf_ln(s, color,
_(" (use \"git am --skip\" to skip this patch)")); _(" (use \"git am --skip\" to skip this patch)"));
status_printf_ln(s, color, status_printf_ln(s, color,