1
0
mirror of https://github.com/git/git.git synced 2025-03-15 02:11:15 +00:00
Junio C Hamano e11d7b5969 "reset --merge": fix unmerged case
Commit 9e8ecea (Add 'merge' mode to 'git reset', 2008-12-01) disallowed
"git reset --merge" when there was unmerged entries.  But it wished if
unmerged entries were reset as if --hard (instead of --merge) has been
used.  This makes sense because all "mergy" operations makes sure that
any path involved in the merge does not have local modifications before
starting, so resetting such a path away won't lose any information.

The previous commit changed the behavior of --merge to accept resetting
unmerged entries if they are reset to a different state than HEAD, but it
did not reset the changes in the work tree, leaving the conflict markers
in the resulting file in the work tree.

Fix it by doing three things:

 - Update the documentation to match the wish of original "reset --merge"
   better, namely, "An unmerged entry is a sign that the path didn't have
   any local modification and can be safely resetted to whatever the new
   HEAD records";

 - Update read_index_unmerged(), which reads the index file into the cache
   while dropping any higher-stage entries down to stage #0, not to copy
   the object name from the higher stage entry.  The code used to take the
   object name from the a stage entry ("base" if you happened to have
   stage #1, or "ours" if both sides added, etc.), which essentially meant
   that you are getting random results depending on what the merge did.

   The _only_ reason we want to keep a previously unmerged entry in the
   index at stage #0 is so that we don't forget the fact that we have
   corresponding file in the work tree in order to be able to remove it
   when the tree we are resetting to does not have the path.  In order to
   differentiate such an entry from ordinary cache entry, the cache entry
   added by read_index_unmerged() is marked as CE_CONFLICTED.

 - Update merged_entry() and deleted_entry() so that they pay attention to
   cache entries marked as CE_CONFLICTED.  They are previously unmerged
   entries, and the files in the work tree that correspond to them are
   resetted away by oneway_merge() to the version from the tree we are
   resetting to.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-03 16:01:05 -08:00
2009-12-09 15:38:51 -08:00
2010-01-03 16:01:05 -08:00
2009-09-14 02:23:36 -07:00
2008-07-19 11:17:43 -07:00
2009-06-30 16:12:24 -07:00
2009-04-17 21:05:49 -07:00
2009-06-18 09:22:46 -07:00
2007-06-07 00:04:01 -07:00
2009-12-22 12:32:39 -08:00
2009-10-30 20:18:31 -07:00
2009-10-30 15:18:11 -07:00
2008-08-28 20:50:10 -07:00
2009-11-23 00:03:15 -08:00
2009-08-05 12:39:33 -07:00
2009-11-23 21:54:39 -08:00
2009-12-05 11:39:13 -08:00
2009-11-23 22:30:08 -08:00
2009-11-23 21:54:39 -08:00
2009-08-07 22:35:17 -07:00
2009-11-23 22:30:08 -08:00
2010-01-03 16:01:05 -08:00
2009-02-13 17:27:58 -08:00
2009-11-20 23:53:55 -08:00
2009-11-20 23:51:23 -08:00
2009-11-23 22:24:01 -08:00
2009-09-13 01:32:26 -07:00
2008-10-10 08:39:20 -07:00
2009-05-01 16:07:29 -07:00
2009-11-22 16:28:14 -08:00
2009-10-03 06:04:38 -04:00
2009-05-20 00:02:24 -07:00
2009-06-18 09:22:46 -07:00
2009-11-28 10:05:44 -08:00
2008-11-02 16:36:40 -08:00
2009-11-23 22:24:01 -08:00
2009-12-08 22:47:09 -08:00
2009-12-08 22:47:09 -08:00
2008-07-13 14:12:48 -07:00
2009-12-23 12:23:11 -08:00
2009-11-23 22:24:01 -08:00
2008-09-07 23:52:16 -07:00
2009-11-04 17:58:15 -08:00
2009-11-04 17:58:15 -08:00
2009-11-13 12:16:30 -08:00
2009-11-22 16:28:14 -08:00
2009-04-22 19:02:12 -07:00
2008-10-25 12:09:31 -07:00
2009-08-21 18:47:53 -07:00
2009-08-21 18:47:53 -07:00
2009-11-30 14:44:22 -08:00
2009-12-16 12:45:25 -08:00
2009-11-23 21:25:55 -08:00
2009-11-23 00:03:15 -08:00
2009-02-14 21:27:35 -08:00
2009-11-23 22:30:08 -08:00
2009-11-23 22:30:08 -08:00
2009-11-04 17:58:15 -08:00
2008-07-21 19:11:50 -07:00
2009-11-04 17:58:15 -08:00
2008-03-02 15:11:07 -08:00
2009-01-17 18:30:41 -08:00
2009-08-30 22:04:46 -07:00
2009-11-20 23:51:23 -08:00
2009-04-20 13:44:14 -07:00
2009-12-10 16:20:59 -08:00
2009-11-22 16:14:48 -08:00
2009-11-13 12:20:47 -08:00
2009-07-22 21:57:41 -07:00

////////////////////////////////////////////////////////////////

	GIT - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public License.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org. To subscribe
to the list, send an email with just "subscribe git" in the body to
majordomo@vger.kernel.org. The mailing list archives are available at
http://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.
Description
Git Source Code Mirror - This is a publish-only repository but pull requests can be turned into patches to the mailing list via GitGitGadget (https://gitgitgadget.github.io/). Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Readme 661 MiB
Languages
C 50.1%
Shell 38.4%
Perl 5.1%
Tcl 3.3%
Python 0.8%
Other 2%