1
0
mirror of https://github.com/git/git.git synced 2025-03-15 14:31:35 +00:00
Michael S. Tsirkin 30e12b924b patch-id: make it stable against hunk reordering
Patch id changes if users reorder file diffs that make up a patch.

As the result is functionally equivalent, a different patch id is
surprising to many users.
In particular, reordering files using diff -O is helpful to make patches
more readable (e.g. API header diff before implementation diff).

Add an option to change patch-id behaviour making it stable against
these kinds of patch change:
calculate SHA1 hash for each hunk separately and sum all hashes
(using a symmetrical sum) to get patch id

We use a 20byte sum and not xor - since xor would give 0 output
for patches that have two identical diffs, which isn't all that
unlikely (e.g. append the same line in two places).

The new behaviour is enabled
- when patchid.stable is true
- when --stable flag is present

Using a new flag --unstable or setting patchid.stable to false force
the historical behaviour.

In the documentation, clarify that patch ID can now be a sum of hashes,
not a hash.
Document how command line and config options affect the
behaviour.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-06-10 13:09:24 -07:00
2014-01-27 10:44:59 -08:00
2014-01-21 13:16:17 -08:00
2013-12-12 14:18:34 -08:00
2014-01-10 10:32:18 -08:00
2013-11-12 13:32:11 -08:00
2013-06-10 10:55:42 -07:00
2014-01-17 12:21:20 -08:00
2013-12-17 12:02:44 -08:00
2014-01-17 12:21:20 -08:00
2013-12-09 14:54:48 -08:00
2014-01-17 12:21:20 -08:00
2013-07-22 16:06:49 -07:00
2014-01-10 10:33:09 -08:00
2014-01-10 10:33:09 -08:00
2013-09-09 14:36:15 -07:00
2014-01-27 10:45:03 -08:00
2013-09-11 15:03:28 -07:00
2014-01-17 12:21:20 -08:00
2013-07-19 09:26:15 -07:00
2014-01-17 12:21:20 -08:00
2013-11-12 09:24:27 -08:00
2014-01-10 10:33:14 -08:00
2013-10-29 12:41:17 -07:00
2014-02-14 11:35:04 -08:00
2014-01-17 12:21:20 -08:00
2013-05-10 10:27:31 -07:00
2013-05-10 10:27:31 -07:00
2013-05-08 15:31:54 -07:00
2013-12-17 12:02:44 -08:00
2013-12-05 12:58:59 -08:00
2013-04-11 17:39:05 -07:00
2013-07-22 16:06:49 -07:00
2013-10-30 12:10:33 -07:00
2014-01-10 10:32:39 -08:00
2013-07-29 12:32:25 -07:00
2013-10-23 13:21:31 -07:00
2013-10-23 13:21:31 -07:00
2014-01-10 10:33:09 -08:00
2014-01-13 11:33:35 -08:00
2014-01-10 10:31:48 -08:00
2013-07-30 08:13:38 -07:00
2013-07-30 08:13:38 -07:00
2013-02-05 16:13:32 -08:00
2013-11-01 07:38:58 -07:00
2014-02-14 11:35:04 -08:00
2014-01-17 12:21:20 -08:00
2014-01-17 12:21:20 -08:00
2013-09-09 14:36:15 -07:00
2013-07-15 10:56:07 -07:00
2013-09-09 14:36:15 -07:00
2013-12-05 12:59:09 -08:00
2013-10-31 13:48:26 -07:00
2014-01-17 12:21:20 -08:00
2014-01-17 12:21:20 -08:00
2014-01-27 10:44:59 -08:00
2013-06-20 16:02:18 -07:00
2014-01-17 12:21:20 -08:00
2013-09-17 11:37:33 -07:00
2013-09-17 11:37:33 -07:00
2014-01-17 12:21:20 -08:00
2014-02-05 10:45:51 -08:00
2013-11-12 09:24:27 -08: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 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.

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 (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 http://news.gmane.org/gmane.comp.version-control.git/,
http://marc.info/?l=git and other archival sites.

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.
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%