Ben Keene 2dfdd705ff git-p4.py: fix --prepare-p4-only error with multiple commits
When using git p4 submit with the --prepare-p4-only option, the program
should prepare a single p4 changelist and notify the user that more
commits are pending and then stop processing.

A bug has been introduced by the p4-changelist hook feature that
causes the program to continue to try and process all pending
changelists at the same time.

The function applyCommit returns True when applying the commit
was successful and the program should continue. However, when the
optional flag --prepare-p4-only is set, the program should stop
after the first application.

Change the logic in the run method for P4Submit to check for the
flag --prepare-p4-only after successfully completing the applyCommit
method.

Be aware - this change will fix the existing test error in t9807.23
for --prepare-p4-only. However there is insufficent coverage for
this flag.  If more than 1 commit is pending submission to P4, the
method will properly prepare the P4 changelist, however it will
still exit the application with an exitcode of 1.

The current documentation does not define what the exit code should be
in this condition.
(See: https://git-scm.com/docs/git-p4#Documentation/git-p4.txt---prepare-p4-only)

Signed-off-by: Ben Keene <seraphire@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-05-12 12:42:32 -07:00
2020-04-29 16:15:28 -07:00
2020-04-22 13:42:58 -07:00
2020-04-29 16:15:42 -07:00
2020-03-21 18:26:56 +08:00
2020-03-05 10:43:02 -08:00
2020-03-25 13:57:41 -07:00
2020-03-25 13:57:41 -07:00
2020-03-30 10:59:08 -07:00
2020-02-19 09:37:15 -08:00
2020-04-10 09:28:02 -07:00
2020-03-24 15:04:44 -07:00
2020-04-22 13:42:49 -07:00
2019-12-25 11:21:58 -08:00
2020-03-25 13:07:47 -07:00
2019-12-25 11:21:58 -08:00
2020-03-10 11:41:40 -07:00
2020-03-10 11:41:40 -07:00
2020-04-28 15:50:05 -07:00
2020-03-24 15:04:43 -07:00
2020-04-28 15:49:58 -07:00
2020-04-19 16:32:24 -07:00
2020-04-22 13:42:44 -07:00
2020-01-15 12:14:51 -08:00
2020-04-19 22:05:56 -07:00
2020-03-02 15:07:20 -08:00
2020-04-29 16:15:27 -07:00
2020-03-28 16:50:40 -07:00
2020-04-22 13:42:49 -07:00
2020-04-29 16:15:27 -07:00
2020-04-10 09:28:02 -07:00
2020-03-24 15:04:44 -07:00
2020-03-24 15:04:44 -07:00
2020-04-19 16:32:24 -07:00
2020-04-29 16:15:27 -07:00
2020-04-28 15:50:04 -07:00
2020-04-29 16:15:27 -07:00
2020-04-29 16:15:27 -07:00
2020-03-26 17:11:20 -07:00
2020-04-28 15:49:56 -07:00
2020-04-28 15:50:04 -07: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-<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).

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://lore.kernel.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 235 MiB
Languages
C 50.1%
Shell 38.4%
Perl 5.1%
Tcl 3.3%
Python 0.8%
Other 2%