kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Use 'fast-forward' all over the place 

It's a compound word.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Felipe Contreras 2009-10-24 11:31:32 +03:00 committed by Junio C Hamano
parent 78d553b7d7
commit a75d7b5409
35 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -1351,7 +1351,7 @@ receive.denyCurrentBranch::


receive.denyNonFastForwards:: receive.denyNonFastForwards::
If set to true, git-receive-pack will deny a ref update which is If set to true, git-receive-pack will deny a ref update which is
not a fast forward. Use this to prevent such an update via a push, not a fast-forward. Use this to prevent such an update via a push,
even if that push is forced. This configuration variable is even if that push is forced. This configuration variable is
set when initializing a shared repository. set when initializing a shared repository.



4
Documentation/git-http-push.txt
View File

@ -82,11 +82,11 @@ destination side.


Without '--force', the <src> ref is stored at the remote only if Without '--force', the <src> ref is stored at the remote only if
<dst> does not exist, or <dst> is a proper subset (i.e. an <dst> does not exist, or <dst> is a proper subset (i.e. an
ancestor) of <src>. This check, known as "fast forward check", ancestor) of <src>. This check, known as "fast-forward check",
is performed in order to avoid accidentally overwriting the is performed in order to avoid accidentally overwriting the
remote ref and lose other peoples' commits from there. remote ref and lose other peoples' commits from there.


With '--force', the fast forward check is disabled for all refs. With '--force', the fast-forward check is disabled for all refs.


Optionally, a <ref> parameter can be prefixed with a plus '+' sign Optionally, a <ref> parameter can be prefixed with a plus '+' sign
to disable the fast-forward check only on that ref. to disable the fast-forward check only on that ref.

14
Documentation/git-push.txt
View File

@ -50,9 +50,9 @@ updated.
+ +
The object referenced by <src> is used to update the <dst> reference The object referenced by <src> is used to update the <dst> reference
on the remote side, but by default this is only allowed if the on the remote side, but by default this is only allowed if the
update can fast forward <dst>. By having the optional leading `{plus}`, update can fast-forward <dst>. By having the optional leading `{plus}`,
you can tell git to update the <dst> ref even when the update is not a you can tell git to update the <dst> ref even when the update is not a
fast forward. This does *not* attempt to merge <src> into <dst>. See fast-forward. This does *not* attempt to merge <src> into <dst>. See
EXAMPLES below for details. EXAMPLES below for details.
+ +
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`. `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
@ -60,7 +60,7 @@ EXAMPLES below for details.
Pushing an empty <src> allows you to delete the <dst> ref from Pushing an empty <src> allows you to delete the <dst> ref from
the remote repository. the remote repository.
+ +
The special refspec `:` (or `{plus}:` to allow non-fast forward updates) The special refspec `:` (or `{plus}:` to allow non-fast-forward updates)
directs git to push "matching" branches: for every branch that exists on directs git to push "matching" branches: for every branch that exists on
the local side, the remote side is updated if a branch of the same name the local side, the remote side is updated if a branch of the same name
already exists on the remote side. This is the default operation mode already exists on the remote side. This is the default operation mode
@ -171,10 +171,10 @@ summary::
For a successfully pushed ref, the summary shows the old and new For a successfully pushed ref, the summary shows the old and new
values of the ref in a form suitable for using as an argument to values of the ref in a form suitable for using as an argument to
`git log` (this is `<old>..<new>` in most cases, and `git log` (this is `<old>..<new>` in most cases, and
`<old>...<new>` for forced non-fast forward updates). For a `<old>...<new>` for forced non-fast-forward updates). For a
failed update, more details are given for the failure. failed update, more details are given for the failure.
The string `rejected` indicates that git did not try to send the The string `rejected` indicates that git did not try to send the
ref at all (typically because it is not a fast forward). The ref at all (typically because it is not a fast-forward). The
string `remote rejected` indicates that the remote end refused string `remote rejected` indicates that the remote end refused
the update; this rejection is typically caused by a hook on the the update; this rejection is typically caused by a hook on the
remote side. The string `remote failure` indicates that the remote side. The string `remote failure` indicates that the
@ -342,9 +342,9 @@ git push origin :experimental::


git push origin {plus}dev:master:: git push origin {plus}dev:master::
Update the origin repository's master branch with the dev branch, Update the origin repository's master branch with the dev branch,
allowing non-fast forward updates. *This can leave unreferenced allowing non-fast-forward updates. *This can leave unreferenced
commits dangling in the origin repository.* Consider the commits dangling in the origin repository.* Consider the
following situation, where a fast forward is not possible: following situation, where a fast-forward is not possible:
+ +
---- ----
o---o---o---A---B origin/master o---o---o---A---B origin/master

2
Documentation/git-read-tree.txt
View File

@ -144,7 +144,7 @@ Two Tree Merge
Typically, this is invoked as `git read-tree -m $H $M`, where $H Typically, this is invoked as `git read-tree -m $H $M`, where $H
is the head commit of the current repository, and $M is the head is the head commit of the current repository, and $M is the head
of a foreign tree, which is simply ahead of $H (i.e. we are in a of a foreign tree, which is simply ahead of $H (i.e. we are in a
fast forward situation). fast-forward situation).


When two trees are specified, the user is telling 'git-read-tree' When two trees are specified, the user is telling 'git-read-tree'
the following: the following:

2
Documentation/git-receive-pack.txt
View File

@ -20,7 +20,7 @@ The UI for the protocol is on the 'git-send-pack' side, and the
program pair is meant to be used to push updates to remote program pair is meant to be used to push updates to remote
repository. For pull operations, see linkgit:git-fetch-pack[1]. repository. For pull operations, see linkgit:git-fetch-pack[1].


The command allows for creation and fast forwarding of sha1 refs The command allows for creation and fast-forwarding of sha1 refs
(heads/tags) on the remote end (strictly speaking, it is the (heads/tags) on the remote end (strictly speaking, it is the
local end 'git-receive-pack' runs, but to the user who is sitting at local end 'git-receive-pack' runs, but to the user who is sitting at
the send-pack end, it is updating the remote. Confused?) the send-pack end, it is updating the remote. Confused?)

4
Documentation/git-reset.txt
View File

@ -150,7 +150,7 @@ Automatic merge failed; fix conflicts and then commit the result.
$ git reset --hard <2> $ git reset --hard <2>
$ git pull . topic/branch <3> $ git pull . topic/branch <3>
Updating from 41223... to 13134... Updating from 41223... to 13134...
Fast forward Fast-forward
$ git reset --hard ORIG_HEAD <4> $ git reset --hard ORIG_HEAD <4>
------------ ------------
+ +
@ -161,7 +161,7 @@ right now, so you decide to do that later.
which is a synonym for "git reset --hard HEAD" clears the mess which is a synonym for "git reset --hard HEAD" clears the mess
from the index file and the working tree. from the index file and the working tree.
<3> Merge a topic branch into the current branch, which resulted <3> Merge a topic branch into the current branch, which resulted
in a fast forward. in a fast-forward.
<4> But you decided that the topic branch is not ready for public <4> But you decided that the topic branch is not ready for public
consumption yet. "pull" or "merge" always leaves the original consumption yet. "pull" or "merge" always leaves the original
tip of the current branch in ORIG_HEAD, so resetting hard to it tip of the current branch in ORIG_HEAD, so resetting hard to it

4
Documentation/git-send-pack.txt
View File

@ -105,11 +105,11 @@ name. See linkgit:git-rev-parse[1].


Without '--force', the <src> ref is stored at the remote only if Without '--force', the <src> ref is stored at the remote only if
<dst> does not exist, or <dst> is a proper subset (i.e. an <dst> does not exist, or <dst> is a proper subset (i.e. an
ancestor) of <src>. This check, known as "fast forward check", ancestor) of <src>. This check, known as "fast-forward check",
is performed in order to avoid accidentally overwriting the is performed in order to avoid accidentally overwriting the
remote ref and lose other peoples' commits from there. remote ref and lose other peoples' commits from there.


With '--force', the fast forward check is disabled for all refs. With '--force', the fast-forward check is disabled for all refs.


Optionally, a <ref> parameter can be prefixed with a plus '+' sign Optionally, a <ref> parameter can be prefixed with a plus '+' sign
to disable the fast-forward check only on that ref. to disable the fast-forward check only on that ref.

4
Documentation/gitcore-tutorial.txt
View File

@ -993,7 +993,7 @@ would be different)


---------------- ----------------
Updating from ae3a2da... to a80b4aa.... Updating from ae3a2da... to a80b4aa....
Fast forward (no commit created; -m option ignored) Fast-forward (no commit created; -m option ignored)
example | 1 + example | 1 +
hello | 1 + hello | 1 +
2 files changed, 2 insertions(+), 0 deletions(-) 2 files changed, 2 insertions(+), 0 deletions(-)
@ -1003,7 +1003,7 @@ Because your branch did not contain anything more than what had
already been merged into the `master` branch, the merge operation did already been merged into the `master` branch, the merge operation did
not actually do a merge. Instead, it just updated the top of not actually do a merge. Instead, it just updated the top of
the tree of your branch to that of the `master` branch. This is the tree of your branch to that of the `master` branch. This is
often called 'fast forward' merge. often called 'fast-forward' merge.


You can run `gitk \--all` again to see how the commit ancestry You can run `gitk \--all` again to see how the commit ancestry
looks like, or run 'show-branch', which tells you this. looks like, or run 'show-branch', which tells you this.

2
Documentation/githooks.txt
View File

@ -229,7 +229,7 @@ from updating that ref.
This hook can be used to prevent 'forced' update on certain refs by This hook can be used to prevent 'forced' update on certain refs by
making sure that the object name is a commit object that is a making sure that the object name is a commit object that is a
descendant of the commit object named by the old object name. descendant of the commit object named by the old object name.
That is, to enforce a "fast forward only" policy. That is, to enforce a "fast-forward only" policy.


It could also be used to log the old..new status. However, it It could also be used to log the old..new status. However, it
does not know the entire set of branches, so it would end up does not know the entire set of branches, so it would end up

4
Documentation/glossary-content.txt
View File

@ -124,7 +124,7 @@ to point at the new commit.
An evil merge is a <<def_merge,merge>> that introduces changes that An evil merge is a <<def_merge,merge>> that introduces changes that
do not appear in any <<def_parent,parent>>. do not appear in any <<def_parent,parent>>.


[[def_fast_forward]]fast forward:: [[def_fast_forward]]fast-forward::
A fast-forward is a special type of <<def_merge,merge>> where you have a A fast-forward is a special type of <<def_merge,merge>> where you have a
<<def_revision,revision>> and you are "merging" another <<def_revision,revision>> and you are "merging" another
<<def_branch,branch>>'s changes that happen to be a descendant of what <<def_branch,branch>>'s changes that happen to be a descendant of what
@ -220,7 +220,7 @@ to point at the new commit.
conflict, manual intervention may be required to complete the conflict, manual intervention may be required to complete the
merge. merge.
+ +
As a noun: unless it is a <<def_fast_forward,fast forward>>, a As a noun: unless it is a <<def_fast_forward,fast-forward>>, a
successful merge results in the creation of a new <<def_commit,commit>> successful merge results in the creation of a new <<def_commit,commit>>
representing the result of the merge, and having as representing the result of the merge, and having as
<<def_parent,parents>> the tips of the merged <<def_branch,branches>>. <<def_parent,parents>> the tips of the merged <<def_branch,branches>>.

2
Documentation/howto/maintain-git.txt
View File

@ -59,7 +59,7 @@ The policy.
not yet pass the criteria set for 'next'. not yet pass the criteria set for 'next'.


- The tips of 'master', 'maint' and 'next' branches will always - The tips of 'master', 'maint' and 'next' branches will always
fast forward, to allow people to build their own fast-forward, to allow people to build their own
customization on top of them. customization on top of them.


- Usually 'master' contains all of 'maint', 'next' contains all - Usually 'master' contains all of 'maint', 'next' contains all

4
Documentation/howto/revert-branch-rebase.txt
View File

@ -85,7 +85,7 @@ Fortunately I did not have to; what I have in the current branch


------------------------------------------------ ------------------------------------------------
$ git checkout master $ git checkout master
$ git merge revert-c99 ;# this should be a fast forward $ git merge revert-c99 ;# this should be a fast-forward
Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c... Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
cache.h | 8 ++++---- cache.h | 8 ++++----
commit.c | 2 +- commit.c | 2 +-
@ -95,7 +95,7 @@ Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
5 files changed, 8 insertions(+), 8 deletions(-) 5 files changed, 8 insertions(+), 8 deletions(-)
------------------------------------------------ ------------------------------------------------


There is no need to redo the test at this point. We fast forwarded There is no need to redo the test at this point. We fast-forwarded
and we know 'master' matches 'revert-c99' exactly. In fact: and we know 'master' matches 'revert-c99' exactly. In fact:


------------------------------------------------ ------------------------------------------------

2
Documentation/howto/update-hook-example.txt
View File

@ -76,7 +76,7 @@ case "$1" in
if expr "$2" : '0*$' >/dev/null; then if expr "$2" : '0*$' >/dev/null; then
info "The branch '$1' is new..." info "The branch '$1' is new..."
else else
# updating -- make sure it is a fast forward # updating -- make sure it is a fast-forward
mb=$(git-merge-base "$2" "$3") mb=$(git-merge-base "$2" "$3")
case "$mb,$2" in case "$mb,$2" in
"$2,$mb") info "Update is fast-forward" ;; "$2,$mb") info "Update is fast-forward" ;;

4
Documentation/pull-fetch-param.txt
View File

@ -11,9 +11,9 @@
+ +
The remote ref that matches <src> The remote ref that matches <src>
is fetched, and if <dst> is not empty string, the local is fetched, and if <dst> is not empty string, the local
ref that matches it is fast forwarded using <src>. ref that matches it is fast-forwarded using <src>.
If the optional plus `+` is used, the local ref If the optional plus `+` is used, the local ref
is updated even if it does not result in a fast forward is updated even if it does not result in a fast-forward
update. update.
+ +
[NOTE] [NOTE]

14
Documentation/user-manual.txt
View File

@ -1384,7 +1384,7 @@ were merged.


However, if the current branch is a descendant of the other--so every However, if the current branch is a descendant of the other--so every
commit present in the one is already contained in the other--then git commit present in the one is already contained in the other--then git
just performs a "fast forward"; the head of the current branch is moved just performs a "fast-forward"; the head of the current branch is moved
forward to point at the head of the merged-in branch, without any new forward to point at the head of the merged-in branch, without any new
commits being created. commits being created.


@ -1719,7 +1719,7 @@ producing a default commit message documenting the branch and
repository that you pulled from. repository that you pulled from.


(But note that no such commit will be created in the case of a (But note that no such commit will be created in the case of a
<<fast-forwards,fast forward>>; instead, your branch will just be <<fast-forwards,fast-forward>>; instead, your branch will just be
updated to point to the latest commit from the upstream branch.) updated to point to the latest commit from the upstream branch.)


The `git pull` command can also be given "." as the "remote" repository, The `git pull` command can also be given "." as the "remote" repository,
@ -1943,7 +1943,7 @@ $ git push ssh://yourserver.com/~you/proj.git master
------------------------------------------------- -------------------------------------------------


As with `git fetch`, `git push` will complain if this does not result in a As with `git fetch`, `git push` will complain if this does not result in a
<<fast-forwards,fast forward>>; see the following section for details on <<fast-forwards,fast-forward>>; see the following section for details on
handling this case. handling this case.


Note that the target of a "push" is normally a Note that the target of a "push" is normally a
@ -1976,7 +1976,7 @@ details.
What to do when a push fails What to do when a push fails
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~


If a push would not result in a <<fast-forwards,fast forward>> of the If a push would not result in a <<fast-forwards,fast-forward>> of the
remote branch, then it will fail with an error like: remote branch, then it will fail with an error like:


------------------------------------------------- -------------------------------------------------
@ -2115,7 +2115,7 @@ $ git checkout release && git pull


Important note! If you have any local changes in these branches, then Important note! If you have any local changes in these branches, then
this merge will create a commit object in the history (with no local this merge will create a commit object in the history (with no local
changes git will simply do a "Fast forward" merge). Many people dislike changes git will simply do a "fast-forward" merge). Many people dislike
the "noise" that this creates in the Linux history, so you should avoid the "noise" that this creates in the Linux history, so you should avoid
doing this capriciously in the "release" branch, as these noisy commits doing this capriciously in the "release" branch, as these noisy commits
will become part of the permanent history when you ask Linus to pull will become part of the permanent history when you ask Linus to pull
@ -2729,9 +2729,9 @@ In the previous example, when updating an existing branch, "git fetch"
checks to make sure that the most recent commit on the remote checks to make sure that the most recent commit on the remote
branch is a descendant of the most recent commit on your copy of the branch is a descendant of the most recent commit on your copy of the
branch before updating your copy of the branch to point at the new branch before updating your copy of the branch to point at the new
commit. Git calls this process a <<fast-forwards,fast forward>>. commit. Git calls this process a <<fast-forwards,fast-forward>>.


A fast forward looks something like this: A fast-forward looks something like this:


................................................ ................................................
o--o--o--o <-- old head of the branch o--o--o--o <-- old head of the branch

8
builtin-fetch--tool.c
View File

@ -97,21 +97,21 @@ static int update_local_ref(const char *name,
strcpy(newh, find_unique_abbrev(sha1_new, DEFAULT_ABBREV)); strcpy(newh, find_unique_abbrev(sha1_new, DEFAULT_ABBREV));


if (in_merge_bases(current, &updated, 1)) { if (in_merge_bases(current, &updated, 1)) {
fprintf(stderr, "* %s: fast forward to %s\n", fprintf(stderr, "* %s: fast-forward to %s\n",
name, note); name, note);
fprintf(stderr, " old..new: %s..%s\n", oldh, newh); fprintf(stderr, " old..new: %s..%s\n", oldh, newh);
return update_ref_env("fast forward", name, sha1_new, sha1_old); return update_ref_env("fast-forward", name, sha1_new, sha1_old);
} }
if (!force) { if (!force) {
fprintf(stderr, fprintf(stderr,
"* %s: not updating to non-fast forward %s\n", "* %s: not updating to non-fast-forward %s\n",
name, note); name, note);
fprintf(stderr, fprintf(stderr,
" old...new: %s...%s\n", oldh, newh); " old...new: %s...%s\n", oldh, newh);
return 1; return 1;
} }
fprintf(stderr, fprintf(stderr,
"* %s: forcing update to non-fast forward %s\n", "* %s: forcing update to non-fast-forward %s\n",
name, note); name, note);
fprintf(stderr, " old...new: %s...%s\n", oldh, newh); fprintf(stderr, " old...new: %s...%s\n", oldh, newh);
return update_ref_env("forced-update", name, sha1_new, sha1_old); return update_ref_env("forced-update", name, sha1_new, sha1_old);

4
builtin-fetch.c
View File

@ -269,7 +269,7 @@ static int update_local_ref(struct ref *ref,
strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
strcat(quickref, ".."); strcat(quickref, "..");
strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV)); strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
r = s_update_ref("fast forward", ref, 1); r = s_update_ref("fast-forward", ref, 1);
sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : ' ', sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : ' ',
SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote, SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
pretty_ref, r ? " (unable to update local ref)" : ""); pretty_ref, r ? " (unable to update local ref)" : "");
@ -287,7 +287,7 @@ static int update_local_ref(struct ref *ref,
r ? "unable to update local ref" : "forced update"); r ? "unable to update local ref" : "forced update");
return r; return r;
} else { } else {
sprintf(display, "! %-*s %-*s -> %s (non fast forward)", sprintf(display, "! %-*s %-*s -> %s (non-fast-forward)",
SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote, SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
pretty_ref); pretty_ref);
return 1; return 1;

8
builtin-merge.c
View File

@ -166,7 +166,7 @@ static struct option builtin_merge_options[] = {
OPT_BOOLEAN(0, "commit", &option_commit, OPT_BOOLEAN(0, "commit", &option_commit,
"perform a commit if the merge succeeds (default)"), "perform a commit if the merge succeeds (default)"),
OPT_BOOLEAN(0, "ff", &allow_fast_forward, OPT_BOOLEAN(0, "ff", &allow_fast_forward,
"allow fast forward (default)"), "allow fast-forward (default)"),
OPT_CALLBACK('s', "strategy", &use_strategies, "strategy", OPT_CALLBACK('s', "strategy", &use_strategies, "strategy",
"merge strategy to use", option_parse_strategy), "merge strategy to use", option_parse_strategy),
OPT_CALLBACK('m', "message", &merge_msg, "message", OPT_CALLBACK('m', "message", &merge_msg, "message",
@ -1013,7 +1013,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
hex, hex,
find_unique_abbrev(remoteheads->item->object.sha1, find_unique_abbrev(remoteheads->item->object.sha1,
DEFAULT_ABBREV)); DEFAULT_ABBREV));
strbuf_addstr(&msg, "Fast forward"); strbuf_addstr(&msg, "Fast-forward");
if (have_message) if (have_message)
strbuf_addstr(&msg, strbuf_addstr(&msg,
" (no commit created; -m option ignored)"); " (no commit created; -m option ignored)");
@ -1031,12 +1031,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
} else if (!remoteheads->next && common->next) } else if (!remoteheads->next && common->next)
; ;
/* /*
* We are not doing octopus and not fast forward. Need * We are not doing octopus and not fast-forward. Need
* a real merge. * a real merge.
*/ */
else if (!remoteheads->next && !common->next && option_commit) { else if (!remoteheads->next && !common->next && option_commit) {
/* /*
* We are not doing octopus, not fast forward, and have * We are not doing octopus, not fast-forward, and have
* only one common. * only one common.
*/ */
refresh_cache(REFRESH_QUIET); refresh_cache(REFRESH_QUIET);

2
builtin-push.c
View File

@ -159,7 +159,7 @@ static int do_push(const char *repo, int flags)
error("failed to push some refs to '%s'", url[i]); error("failed to push some refs to '%s'", url[i]);
if (nonfastforward && advice_push_nonfastforward) { if (nonfastforward && advice_push_nonfastforward) {
printf("To prevent you from losing history, non-fast-forward updates were rejected\n" printf("To prevent you from losing history, non-fast-forward updates were rejected\n"
"Merge the remote changes before pushing again. See the 'non-fast forward'\n" "Merge the remote changes before pushing again. See the 'non-fast-forward'\n"
"section of 'git push --help' for details.\n"); "section of 'git push --help' for details.\n");
} }
errs++; errs++;

4
builtin-receive-pack.c
View File

@ -329,9 +329,9 @@ static const char *update(struct command *cmd)
break; break;
free_commit_list(bases); free_commit_list(bases);
if (!ent) { if (!ent) {
error("denying non-fast forward %s" error("denying non-fast-forward %s"
" (you should pull first)", name); " (you should pull first)", name);
return "non-fast forward"; return "non-fast-forward";
} }
} }
if (run_update_hook(cmd)) { if (run_update_hook(cmd)) {

2
builtin-remote.c
View File

@ -953,7 +953,7 @@ static int show_push_info_item(struct string_list_item *item, void *cb_data)
status = "up to date"; status = "up to date";
break; break;
case PUSH_STATUS_FASTFORWARD: case PUSH_STATUS_FASTFORWARD:
status = "fast forwardable"; status = "fast-forwardable";
break; break;
case PUSH_STATUS_OUTOFDATE: case PUSH_STATUS_OUTOFDATE:
status = "local out of date"; status = "local out of date";

2
builtin-send-pack.c
View File

@ -246,7 +246,7 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count)
break; break;
case REF_STATUS_REJECT_NONFASTFORWARD: case REF_STATUS_REJECT_NONFASTFORWARD:
print_ref_status('!', "[rejected]", ref, ref->peer_ref, print_ref_status('!', "[rejected]", ref, ref->peer_ref,
"non-fast forward"); "non-fast-forward");
break; break;
case REF_STATUS_REMOTE_REJECT: case REF_STATUS_REMOTE_REJECT:
print_ref_status('!', "[remote rejected]", ref, print_ref_status('!', "[remote rejected]", ref,

8
contrib/examples/git-merge.sh
View File

@ -14,7 +14,7 @@ summary (synonym to --stat)
log add list of one-line log to merge commit message log add list of one-line log to merge commit message
squash create a single commit instead of doing a merge squash create a single commit instead of doing a merge
commit perform a commit if the merge succeeds (default) commit perform a commit if the merge succeeds (default)
ff allow fast forward (default) ff allow fast-forward (default)
s,strategy= merge strategy to use s,strategy= merge strategy to use
m,message= message to be used for the merge commit (if any) m,message= message to be used for the merge commit (if any)
" "
@ -353,7 +353,7 @@ t,1,"$head",*)
# Again the most common case of merging one remote. # Again the most common case of merging one remote.
echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $1)" echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $1)"
git update-index --refresh 2>/dev/null git update-index --refresh 2>/dev/null
msg="Fast forward" msg="Fast-forward"
if test -n "$have_message" if test -n "$have_message"
then then
msg="$msg (no commit created; -m option ignored)" msg="$msg (no commit created; -m option ignored)"
@ -365,11 +365,11 @@ t,1,"$head",*)
exit 0 exit 0
;; ;;
?,1,?*"$LF"?*,*) ?,1,?*"$LF"?*,*)
# We are not doing octopus and not fast forward. Need a # We are not doing octopus and not fast-forward. Need a
# real merge. # real merge.
;; ;;
?,1,*,) ?,1,*,)
# We are not doing octopus, not fast forward, and have only # We are not doing octopus, not fast-forward, and have only
# one common. # one common.
git update-index --refresh 2>/dev/null git update-index --refresh 2>/dev/null
case "$allow_trivial_merge" in case "$allow_trivial_merge" in

2
contrib/examples/git-resolve.sh
View File

@ -48,7 +48,7 @@ case "$common" in
"$head") "$head")
echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $merge)" echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $merge)"
git read-tree -u -m $head $merge || exit 1 git read-tree -u -m $head $merge || exit 1
git update-ref -m "resolve $merge_name: Fast forward" \ git update-ref -m "resolve $merge_name: Fast-forward" \
HEAD "$merge" "$head" HEAD "$merge" "$head"
git diff-tree -p $head $merge | git apply --stat git diff-tree -p $head $merge | git apply --stat
dropheads dropheads

6
contrib/hooks/post-receive-email
View File

@ -315,8 +315,8 @@ generate_update_branch_email()
# "remotes/" will be ignored as well. # "remotes/" will be ignored as well.


# List all of the revisions that were removed by this update, in a # List all of the revisions that were removed by this update, in a
# fast forward update, this list will be empty, because rev-list O # fast-forward update, this list will be empty, because rev-list O
# ^N is empty. For a non fast forward, O ^N is the list of removed # ^N is empty. For a non-fast-forward, O ^N is the list of removed
# revisions # revisions
fast_forward="" fast_forward=""
rev="" rev=""
@ -411,7 +411,7 @@ generate_update_branch_email()
# revision because the base is effectively a random revision at this # revision because the base is effectively a random revision at this
# point - the user will be interested in what this revision changed # point - the user will be interested in what this revision changed
# - including the undoing of previous revisions in the case of # - including the undoing of previous revisions in the case of
# non-fast forward updates. # non-fast-forward updates.
echo "" echo ""
echo "Summary of changes:" echo "Summary of changes:"
git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev

2
git-merge-octopus.sh
View File

@ -81,7 +81,7 @@ do
# tree as the intermediate result of the merge. # tree as the intermediate result of the merge.
# We still need to count this as part of the parent set. # We still need to count this as part of the parent set.


echo "Fast forwarding to: $SHA1" echo "Fast-forwarding to: $SHA1"
git read-tree -u -m $head $SHA1 || exit git read-tree -u -m $head $SHA1 || exit
MRC=$SHA1 MRT=$(git write-tree) MRC=$SHA1 MRT=$(git write-tree)
continue continue

2
git-pull.sh
View File

@ -171,7 +171,7 @@ then
# First update the working tree to match $curr_head. # First update the working tree to match $curr_head.


echo >&2 "Warning: fetch updated the current branch head." echo >&2 "Warning: fetch updated the current branch head."
echo >&2 "Warning: fast forwarding your working tree from" echo >&2 "Warning: fast-forwarding your working tree from"
echo >&2 "Warning: commit $orig_head." echo >&2 "Warning: commit $orig_head."
git update-index -q --refresh git update-index -q --refresh
git read-tree -u -m "$orig_head" "$curr_head" || git read-tree -u -m "$orig_head" "$curr_head" ||

6
git-rebase--interactive.sh
View File

@ -168,7 +168,7 @@ pick_one () {
output git reset --hard $sha1 output git reset --hard $sha1
test "a$1" = a-n && output git reset --soft $current_sha1 test "a$1" = a-n && output git reset --soft $current_sha1
sha1=$(git rev-parse --short $sha1) sha1=$(git rev-parse --short $sha1)
output warn Fast forward to $sha1 output warn Fast-forward to $sha1
else else
output git cherry-pick "$@" output git cherry-pick "$@"
fi fi
@ -248,9 +248,9 @@ pick_one_preserving_merges () {
done done
case $fast_forward in case $fast_forward in
t) t)
output warn "Fast forward to $sha1" output warn "Fast-forward to $sha1"
output git reset --hard $sha1 || output git reset --hard $sha1 ||
die "Cannot fast forward to $sha1" die "Cannot fast-forward to $sha1"
;; ;;
f) f)
first_parent=$(expr "$new_parents" : ' \([^ ]*\)') first_parent=$(expr "$new_parents" : ' \([^ ]*\)')

2
git-rebase.sh
View File

@ -496,7 +496,7 @@ then
fi fi


# If the $onto is a proper descendant of the tip of the branch, then # If the $onto is a proper descendant of the tip of the branch, then
# we just fast forwarded. # we just fast-forwarded.
if test "$mb" = "$branch" if test "$mb" = "$branch"
then then
say "Fast-forwarded $branch_name to $onto_name." say "Fast-forwarded $branch_name to $onto_name."

6
t/t1001-read-tree-m-2way.sh
View File

@ -5,7 +5,7 @@


test_description='Two way merge with read-tree -m $H $M test_description='Two way merge with read-tree -m $H $M


This test tries two-way merge (aka fast forward with carry forward). This test tries two-way merge (aka fast-forward with carry forward).


There is the head (called H) and another commit (called M), which is There is the head (called H) and another commit (called M), which is
simply ahead of H. The index and the work tree contains a state that simply ahead of H. The index and the work tree contains a state that
@ -51,7 +51,7 @@ check_cache_at () {
} }


cat >bozbar-old <<\EOF cat >bozbar-old <<\EOF
This is a sample file used in two-way fast forward merge This is a sample file used in two-way fast-forward merge
tests. Its second line ends with a magic word bozbar tests. Its second line ends with a magic word bozbar
which will be modified by the merged head to gnusto. which will be modified by the merged head to gnusto.
It has some extra lines so that external tools can It has some extra lines so that external tools can
@ -300,7 +300,7 @@ test_expect_success \
echo gnusto gnusto >bozbar && echo gnusto gnusto >bozbar &&
if read_tree_twoway $treeH $treeM; then false; else :; fi' if read_tree_twoway $treeH $treeM; then false; else :; fi'


# This fails with straight two-way fast forward. # This fails with straight two-way fast-forward.
test_expect_success \ test_expect_success \
'22 - local change cache updated.' \ '22 - local change cache updated.' \
'rm -f .git/index && 'rm -f .git/index &&

2
t/t5505-remote.sh
View File

@ -158,7 +158,7 @@ cat > test/expect << EOF
another another
master master
Local refs configured for 'git push': Local refs configured for 'git push':
ahead forces to master (fast forwardable) ahead forces to master (fast-forwardable)
master pushes to another (up to date) master pushes to another (up to date)
EOF EOF



2
t/t5518-fetch-exit-status.sh
View File

@ -22,7 +22,7 @@ test_expect_success setup '
git commit -a -m next git commit -a -m next
' '


test_expect_success 'non fast forward fetch' ' test_expect_success 'non-fast-forward fetch' '


test_must_fail git fetch . master:side test_must_fail git fetch . master:side



2
t/t6028-merge-up-to-date.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh


test_description='merge fast forward and up to date' test_description='merge fast-forward and up to date'


. ./test-lib.sh . ./test-lib.sh



2
transport.c
View File

@ -668,7 +668,7 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count, i
break; break;
case REF_STATUS_REJECT_NONFASTFORWARD: case REF_STATUS_REJECT_NONFASTFORWARD:
print_ref_status('!', "[rejected]", ref, ref->peer_ref, print_ref_status('!', "[rejected]", ref, ref->peer_ref,
"non-fast forward", porcelain); "non-fast-forward", porcelain);
break; break;
case REF_STATUS_REMOTE_REJECT: case REF_STATUS_REMOTE_REJECT:
print_ref_status('!', "[remote rejected]", ref, print_ref_status('!', "[remote rejected]", ref,

2
unpack-trees.c
View File

@ -895,7 +895,7 @@ int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
* Two-way merge. * Two-way merge.
* *
* The rule is to "carry forward" what is in the index without losing * The rule is to "carry forward" what is in the index without losing
* information across a "fast forward", favoring a successful merge * information across a "fast-forward", favoring a successful merge
* over a merge failure when it makes sense. For details of the * over a merge failure when it makes sense. For details of the
* "carry forward" rule, please see <Documentation/git-read-tree.txt>. * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
* *