mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Remove git-resolve.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
07fef5fc15
commit
207dfa0791
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -101,7 +101,6 @@ git-repo-config
|
||||||
git-request-pull
|
git-request-pull
|
||||||
git-rerere
|
git-rerere
|
||||||
git-reset
|
git-reset
|
||||||
git-resolve
|
|
||||||
git-rev-list
|
git-rev-list
|
||||||
git-rev-parse
|
git-rev-parse
|
||||||
git-revert
|
git-revert
|
||||||
|
|
|
@ -149,7 +149,6 @@ sub format_one {
|
||||||
git-request-pull foreignscminterface
|
git-request-pull foreignscminterface
|
||||||
git-rerere ancillaryinterrogators
|
git-rerere ancillaryinterrogators
|
||||||
git-reset mainporcelain
|
git-reset mainporcelain
|
||||||
git-resolve mainporcelain
|
|
||||||
git-revert mainporcelain
|
git-revert mainporcelain
|
||||||
git-rev-list plumbinginterrogators
|
git-rev-list plumbinginterrogators
|
||||||
git-rev-parse ancillaryinterrogators
|
git-rev-parse ancillaryinterrogators
|
||||||
|
|
|
@ -587,4 +587,5 @@ stages to temporary files and calls a "merge" script on it:
|
||||||
|
|
||||||
git-merge-index git-merge-one-file hello.c
|
git-merge-index git-merge-one-file hello.c
|
||||||
|
|
||||||
and that is what higher level `git resolve` is implemented with.
|
and that is what higher level `git merge -s resolve` is implemented
|
||||||
|
with.
|
||||||
|
|
|
@ -977,7 +977,7 @@ see more complex cases.
|
||||||
Now, let's pretend you are the one who did all the work in
|
Now, let's pretend you are the one who did all the work in
|
||||||
`mybranch`, and the fruit of your hard work has finally been merged
|
`mybranch`, and the fruit of your hard work has finally been merged
|
||||||
to the `master` branch. Let's go back to `mybranch`, and run
|
to the `master` branch. Let's go back to `mybranch`, and run
|
||||||
resolve to get the "upstream changes" back to your branch.
|
`git merge` to get the "upstream changes" back to your branch.
|
||||||
|
|
||||||
------------
|
------------
|
||||||
$ git checkout mybranch
|
$ git checkout mybranch
|
||||||
|
@ -996,7 +996,7 @@ Fast forward
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
Because your branch did not contain anything more than what are
|
Because your branch did not contain anything more than what are
|
||||||
already merged into the `master` branch, the resolve operation did
|
already 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.
|
||||||
|
@ -1099,11 +1099,11 @@ programs, which are 'commit walkers'; they outlived their
|
||||||
usefulness when git Native and SSH transports were introduced,
|
usefulness when git Native and SSH transports were introduced,
|
||||||
and not used by `git pull` or `git push` scripts.
|
and not used by `git pull` or `git push` scripts.
|
||||||
|
|
||||||
Once you fetch from the remote repository, you `resolve` that
|
Once you fetch from the remote repository, you `merge` that
|
||||||
with your current branch.
|
with your current branch.
|
||||||
|
|
||||||
However -- it's such a common thing to `fetch` and then
|
However -- it's such a common thing to `fetch` and then
|
||||||
immediately `resolve`, that it's called `git pull`, and you can
|
immediately `merge`, that it's called `git pull`, and you can
|
||||||
simply do
|
simply do
|
||||||
|
|
||||||
----------------
|
----------------
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
git-resolve(1)
|
|
||||||
==============
|
|
||||||
|
|
||||||
NAME
|
|
||||||
----
|
|
||||||
git-resolve - Merge two commits
|
|
||||||
|
|
||||||
|
|
||||||
SYNOPSIS
|
|
||||||
--------
|
|
||||||
'git-resolve' <current> <merged> <message>
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
-----------
|
|
||||||
DEPRECATED and will be removed in 1.5.1. Use `git-merge` instead.
|
|
||||||
|
|
||||||
Given two commits and a merge message, merge the <merged> commit
|
|
||||||
into <current> commit, with the commit log message <message>.
|
|
||||||
|
|
||||||
When <current> is a descendant of <merged>, or <current> is an
|
|
||||||
ancestor of <merged>, no new commit is created and the <message>
|
|
||||||
is ignored. The former is informally called "already up to
|
|
||||||
date", and the latter is often called "fast forward".
|
|
||||||
|
|
||||||
|
|
||||||
Author
|
|
||||||
------
|
|
||||||
Written by Linus Torvalds <torvalds@osdl.org> and
|
|
||||||
Dan Holmsand <holmsand@gmail.com>.
|
|
||||||
|
|
||||||
Documentation
|
|
||||||
--------------
|
|
||||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
||||||
|
|
||||||
GIT
|
|
||||||
---
|
|
||||||
Part of the gitlink:git[7] suite
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ Fortunately I did not have to; what I have in the current branch
|
||||||
|
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
$ git checkout master
|
$ git checkout master
|
||||||
$ git resolve master revert-c99 fast ;# 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,13 +95,6 @@ Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
|
||||||
5 files changed, 8 insertions(+), 8 deletions(-)
|
5 files changed, 8 insertions(+), 8 deletions(-)
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
|
|
||||||
The 'fast' in the above 'git resolve' is not a magic. I knew this
|
|
||||||
'resolve' would result in a fast forward merge, and if not, there is
|
|
||||||
something very wrong (so I would do 'git reset' on the 'master' branch
|
|
||||||
and examine the situation). When a fast forward merge is done, the
|
|
||||||
message parameter to 'git resolve' is discarded, because no new commit
|
|
||||||
is created. You could have said 'junk' or 'nothing' there as well.
|
|
||||||
|
|
||||||
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:
|
||||||
|
|
||||||
|
|
|
@ -2755,7 +2755,7 @@ stages to temporary files and calls a "merge" script on it:
|
||||||
$ git-merge-index git-merge-one-file hello.c
|
$ git-merge-index git-merge-one-file hello.c
|
||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
|
|
||||||
and that is what higher level `git resolve` is implemented with.
|
and that is what higher level `git merge -s resolve` is implemented with.
|
||||||
|
|
||||||
How git stores objects efficiently: pack files
|
How git stores objects efficiently: pack files
|
||||||
----------------------------------------------
|
----------------------------------------------
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -172,7 +172,7 @@ SCRIPT_SH = \
|
||||||
git-merge-one-file.sh git-parse-remote.sh \
|
git-merge-one-file.sh git-parse-remote.sh \
|
||||||
git-pull.sh git-rebase.sh \
|
git-pull.sh git-rebase.sh \
|
||||||
git-repack.sh git-request-pull.sh git-reset.sh \
|
git-repack.sh git-request-pull.sh git-reset.sh \
|
||||||
git-resolve.sh git-revert.sh git-sh-setup.sh \
|
git-revert.sh git-sh-setup.sh \
|
||||||
git-tag.sh git-verify-tag.sh \
|
git-tag.sh git-verify-tag.sh \
|
||||||
git-applymbox.sh git-applypatch.sh git-am.sh \
|
git-applymbox.sh git-applypatch.sh git-am.sh \
|
||||||
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
|
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
|
||||||
|
|
|
@ -298,7 +298,6 @@ __git_commands ()
|
||||||
reflog) : plumbing;;
|
reflog) : plumbing;;
|
||||||
repo-config) : plumbing;;
|
repo-config) : plumbing;;
|
||||||
rerere) : plumbing;;
|
rerere) : plumbing;;
|
||||||
resolve) : dead dont use;;
|
|
||||||
rev-list) : plumbing;;
|
rev-list) : plumbing;;
|
||||||
rev-parse) : plumbing;;
|
rev-parse) : plumbing;;
|
||||||
runstatus) : plumbing;;
|
runstatus) : plumbing;;
|
||||||
|
|
|
@ -101,7 +101,9 @@ echo "Play, play, play" >>hello
|
||||||
echo "Lots of fun" >>example
|
echo "Lots of fun" >>example
|
||||||
git commit -m 'Some fun.' -i hello example
|
git commit -m 'Some fun.' -i hello example
|
||||||
|
|
||||||
test_expect_failure 'git resolve now fails' 'git resolve HEAD mybranch "Merge work in mybranch"'
|
test_expect_failure 'git resolve now fails' '
|
||||||
|
git merge -m "Merge work in mybranch" mybranch
|
||||||
|
'
|
||||||
|
|
||||||
cat > hello << EOF
|
cat > hello << EOF
|
||||||
Hello World
|
Hello World
|
||||||
|
@ -134,8 +136,8 @@ Updating from VARIABLE to VARIABLE
|
||||||
2 files changed, 2 insertions(+), 0 deletions(-)
|
2 files changed, 2 insertions(+), 0 deletions(-)
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
git resolve HEAD master "Merge upstream changes." | \
|
git merge -s "Merge upstream changes." master | \
|
||||||
sed -e "1s/[0-9a-f]\{40\}/VARIABLE/g" > resolve.output
|
sed -e "1s/[0-9a-f]\{40\}/VARIABLE/g" >resolve.output
|
||||||
test_expect_success 'git resolve' 'cmp resolve.expect resolve.output'
|
test_expect_success 'git resolve' 'cmp resolve.expect resolve.output'
|
||||||
|
|
||||||
cat > show-branch2.expect << EOF
|
cat > show-branch2.expect << EOF
|
||||||
|
|
Loading…
Reference in a new issue