Elijah Newren cf7b857a77 fast-import: fix erroneous handling of get-mark with empty orphan commits
When get-mark was introduced in commit 28c7b1f7b7 ("fast-import: add a
get-mark command", 2015-07-01), it followed the precedent of the
cat-blob command to be allowed on any line other than in the middle of a
data directive; see commit 777f80d742 ("fast-import: Allow cat-blob
requests at arbitrary points in stream", 2010-11-28).  It was useful to
allow cat-blob directives in the middle of a commit to get more data
that would be used in writing the current commit object.  get-mark is
not similarly useful since fast-import can already use either object id
or mark.  Further, trying to allow this command anywhere caused parsing
bugs.  Fix the parsing problems by only allowing get-mark commands to
appear when other commands have completed.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-01 11:59:09 +09:00
2019-03-02 19:12:58 +01:00
2018-08-02 13:54:58 -07:00
2018-08-20 12:41:32 -07:00
2018-12-09 12:37:32 +09:00
2019-01-14 15:29:32 -08:00
2019-02-06 22:05:23 -08:00
2018-09-12 15:15:34 -07:00
2019-01-02 10:19:05 -08:00
2019-01-14 12:13:04 -08:00
2018-11-02 11:04:53 +09:00
2018-03-30 12:49:57 -07:00
2018-03-30 12:49:57 -07:00
2019-02-05 14:26:09 -08:00
2019-02-05 14:26:09 -08:00
2018-05-08 15:59:17 +09:00
2018-11-19 16:24:41 +09:00
2018-08-20 12:41:32 -07:00
2019-02-06 22:05:24 -08:00
2019-02-05 14:26:17 -08:00
2018-10-19 13:34:02 +09:00
2018-10-19 13:34:02 +09:00
2019-02-06 22:05:23 -08:00
2019-01-14 15:29:29 -08:00
2018-05-08 15:59:17 +09:00
2019-02-24 07:55:19 -08:00
2019-02-06 22:05:23 -08:00
2018-11-05 13:42:11 +09:00
2018-12-12 17:18:29 +09:00
2018-08-29 13:05:35 -07:00
2019-01-14 12:13:04 -08:00
2019-01-04 13:33:32 -08:00
2018-11-13 22:37:19 +09:00
2019-02-07 13:02:28 -08:00
2018-10-04 11:12:14 -07:00
2018-10-04 11:12:14 -07:00
2019-02-05 14:26:09 -08:00
2019-02-05 14:26:09 -08:00
2018-06-01 15:06:37 +09:00
2019-01-04 13:33:31 -08:00
2018-10-19 13:34:02 +09:00
2019-01-04 13:33:32 -08:00
2019-02-06 22:05:23 -08:00
2019-02-05 14:26:09 -08:00
2019-02-05 14:26:09 -08:00
2018-11-02 12:14:21 +09:00
2018-11-02 12:14:21 +09:00
2018-12-09 12:37:32 +09:00
2018-08-15 15:08:23 -07:00
2018-09-17 13:53:52 -07:00
2019-02-06 22:05:23 -08:00
2019-02-06 22:05:23 -08:00
2019-01-14 12:13:04 -08:00
2018-08-20 15:31:40 -07:00
2018-06-01 15:06:37 +09:00
2019-02-05 14:26:11 -08:00
2018-11-02 11:04:54 +09:00
2018-11-02 11:04:54 +09:00
2019-02-06 22:05:23 -08:00
2018-12-09 12:37:32 +09:00
2019-01-29 12:47:56 -08:00
2019-02-06 22:05:23 -08:00
2018-08-15 11:52:09 -07:00
2018-05-30 21:51:28 +09:00
2018-10-19 13:34:02 +09:00

Build Status

Git - fast, scalable, distributed revision control system

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 version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

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

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-.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).

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 (read Documentation/SubmittingPatches for instructions on patch submission). 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 https://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (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
Description
No description provided
Readme 279 MiB
Languages
C 50.5%
Shell 38.7%
Perl 4.5%
Tcl 3.2%
Python 0.8%
Other 2.1%