2008-06-06 07:07:28 +00:00
|
|
|
gitdiffcore(7)
|
|
|
|
==============
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2008-06-06 07:07:28 +00:00
|
|
|
NAME
|
|
|
|
----
|
2010-03-21 17:30:17 +00:00
|
|
|
gitdiffcore - Tweaking diff output
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2008-06-06 07:07:28 +00:00
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2011-07-02 02:38:26 +00:00
|
|
|
[verse]
|
2008-07-03 05:37:18 +00:00
|
|
|
'git diff' *
|
2008-06-06 07:07:28 +00:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2010-01-09 23:33:00 +00:00
|
|
|
The diff commands 'git diff-index', 'git diff-files', and 'git diff-tree'
|
2007-02-08 01:03:46 +00:00
|
|
|
can be told to manipulate differences they find in
|
2008-07-03 05:55:07 +00:00
|
|
|
unconventional ways before showing 'diff' output. The manipulation
|
2005-10-29 04:15:49 +00:00
|
|
|
is collectively called "diffcore transformation". This short note
|
2008-07-03 05:37:18 +00:00
|
|
|
describes what they are and how to use them to produce 'diff' output
|
2008-07-03 05:30:25 +00:00
|
|
|
that is easier to understand than the conventional kind.
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
|
|
|
|
The chain of operation
|
|
|
|
----------------------
|
|
|
|
|
2010-01-09 23:33:00 +00:00
|
|
|
The 'git diff-{asterisk}' family works by first comparing two sets of
|
2005-06-05 21:30:58 +00:00
|
|
|
files:
|
|
|
|
|
2010-01-09 23:33:00 +00:00
|
|
|
- 'git diff-index' compares contents of a "tree" object and the
|
2016-06-28 11:40:11 +00:00
|
|
|
working directory (when `--cached` flag is not used) or a
|
|
|
|
"tree" object and the index file (when `--cached` flag is
|
2005-06-05 21:30:58 +00:00
|
|
|
used);
|
|
|
|
|
2010-01-09 23:33:00 +00:00
|
|
|
- 'git diff-files' compares contents of the index file and the
|
2005-06-05 21:30:58 +00:00
|
|
|
working directory;
|
|
|
|
|
2010-01-09 23:33:00 +00:00
|
|
|
- 'git diff-tree' compares contents of two "tree" objects;
|
2005-10-29 04:15:49 +00:00
|
|
|
|
2008-09-19 20:12:53 +00:00
|
|
|
In all of these cases, the commands themselves first optionally limit
|
|
|
|
the two sets of files by any pathspecs given on their command-lines,
|
|
|
|
and compare corresponding paths in the two resulting sets of files.
|
|
|
|
|
|
|
|
The pathspecs are used to limit the world diff operates in. They remove
|
|
|
|
the filepairs outside the specified sets of pathnames. E.g. If the
|
|
|
|
input set of filepairs included:
|
|
|
|
|
|
|
|
------------------------------------------------
|
|
|
|
:100644 100644 bcd1234... 0123456... M junkfile
|
|
|
|
------------------------------------------------
|
|
|
|
|
|
|
|
but the command invocation was `git diff-files myfile`, then the
|
|
|
|
junkfile entry would be removed from the list because only "myfile"
|
|
|
|
is under consideration.
|
|
|
|
|
|
|
|
The result of comparison is passed from these commands to what is
|
|
|
|
internally called "diffcore", in a format similar to what is output
|
|
|
|
when the -p option is not used. E.g.
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2005-08-30 20:51:01 +00:00
|
|
|
------------------------------------------------
|
|
|
|
in-place edit :100644 100644 bcd1234... 0123456... M file0
|
|
|
|
create :000000 100644 0000000... 1234567... A file4
|
|
|
|
delete :100644 000000 1234567... 0000000... D file5
|
|
|
|
unmerged :000000 000000 0000000... 0000000... U file6
|
|
|
|
------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
The diffcore mechanism is fed a list of such comparison results
|
|
|
|
(each of which is called "filepair", although at this point each
|
|
|
|
of them talks about a single file), and transforms such a list
|
2008-09-19 20:12:53 +00:00
|
|
|
into another list. There are currently 5 such transformations:
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2005-08-30 20:51:01 +00:00
|
|
|
- diffcore-break
|
|
|
|
- diffcore-rename
|
|
|
|
- diffcore-merge-broken
|
|
|
|
- diffcore-pickaxe
|
|
|
|
- diffcore-order
|
diff: --{rotate,skip}-to=<path>
In the implementation of "git difftool", there is a case where the
user wants to start viewing the diffs at a specific path and
continue on to the rest, optionally wrapping around to the
beginning. Since it is somewhat cumbersome to implement such a
feature as a post-processing step of "git diff" output, let's
support it internally with two new options.
- "git diff --rotate-to=C", when the resulting patch would show
paths A B C D E without the option, would "rotate" the paths to
shows patch to C D E A B instead. It is an error when there is
no patch for C is shown.
- "git diff --skip-to=C" would instead "skip" the paths before C,
and shows patch to C D E. Again, it is an error when there is no
patch for C is shown.
- "git log [-p]" also accepts these two options, but it is not an
error if there is no change to the specified path. Instead, the
set of output paths are rotated or skipped to the specified path
or the first path that sorts after the specified path.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-02-11 19:57:50 +00:00
|
|
|
- diffcore-rotate
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2010-01-09 23:33:00 +00:00
|
|
|
These are applied in sequence. The set of filepairs 'git diff-{asterisk}'
|
2008-09-19 20:12:53 +00:00
|
|
|
commands find are used as the input to diffcore-break, and
|
|
|
|
the output from diffcore-break is used as the input to the
|
2005-06-05 21:30:58 +00:00
|
|
|
next transformation. The final result is then passed to the
|
|
|
|
output routine and generates either diff-raw format (see Output
|
2010-01-09 23:33:00 +00:00
|
|
|
format sections of the manual for 'git diff-{asterisk}' commands) or
|
2005-06-05 21:30:58 +00:00
|
|
|
diff-patch format.
|
|
|
|
|
|
|
|
|
2017-02-28 08:59:05 +00:00
|
|
|
diffcore-break: For Splitting Up Complete Rewrites
|
|
|
|
--------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
The second transformation in the chain is diffcore-break, and is
|
2010-01-09 23:33:00 +00:00
|
|
|
controlled by the -B option to the 'git diff-{asterisk}' commands. This is
|
2005-06-05 21:30:58 +00:00
|
|
|
used to detect a filepair that represents "complete rewrite" and
|
|
|
|
break such filepair into two filepairs that represent delete and
|
|
|
|
create. E.g. If the input contained this filepair:
|
|
|
|
|
2005-08-30 20:51:01 +00:00
|
|
|
------------------------------------------------
|
|
|
|
:100644 100644 bcd1234... 0123456... M file0
|
|
|
|
------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
and if it detects that the file "file0" is completely rewritten,
|
|
|
|
it changes it to:
|
|
|
|
|
2005-08-30 20:51:01 +00:00
|
|
|
------------------------------------------------
|
|
|
|
:100644 000000 bcd1234... 0000000... D file0
|
|
|
|
:000000 100644 0000000... 0123456... A file0
|
|
|
|
------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
For the purpose of breaking a filepair, diffcore-break examines
|
|
|
|
the extent of changes between the contents of the files before
|
|
|
|
and after modification (i.e. the contents that have "bcd1234..."
|
2013-04-15 17:49:04 +00:00
|
|
|
and "0123456..." as their SHA-1 content ID, in the above
|
2005-06-05 21:30:58 +00:00
|
|
|
example). The amount of deletion of original contents and
|
|
|
|
insertion of new material are added together, and if it exceeds
|
|
|
|
the "break score", the filepair is broken into two. The break
|
|
|
|
score defaults to 50% of the size of the smaller of the original
|
|
|
|
and the result (i.e. if the edit shrinks the file, the size of
|
|
|
|
the result is used; if the edit lengthens the file, the size of
|
|
|
|
the original is used), and can be customized by giving a number
|
|
|
|
after "-B" option (e.g. "-B75" to tell it to use 75%).
|
|
|
|
|
|
|
|
|
2017-02-28 08:59:04 +00:00
|
|
|
diffcore-rename: For Detecting Renames and Copies
|
2005-10-29 07:50:42 +00:00
|
|
|
-------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
This transformation is used to detect renames and copies, and is
|
|
|
|
controlled by the -M option (to detect renames) and the -C option
|
2010-01-09 23:33:00 +00:00
|
|
|
(to detect copies as well) to the 'git diff-{asterisk}' commands. If the
|
2005-06-05 21:30:58 +00:00
|
|
|
input contained these filepairs:
|
|
|
|
|
2005-08-30 20:51:01 +00:00
|
|
|
------------------------------------------------
|
|
|
|
:100644 000000 0123456... 0000000... D fileX
|
|
|
|
:000000 100644 0000000... 0123456... A file0
|
|
|
|
------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
and the contents of the deleted file fileX is similar enough to
|
|
|
|
the contents of the created file file0, then rename detection
|
|
|
|
merges these filepairs and creates:
|
|
|
|
|
2005-08-30 20:51:01 +00:00
|
|
|
------------------------------------------------
|
|
|
|
:100644 100644 0123456... 0123456... R100 fileX file0
|
|
|
|
------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2005-10-29 04:15:49 +00:00
|
|
|
When the "-C" option is used, the original contents of modified files,
|
|
|
|
and deleted files (and also unmodified files, if the
|
2015-05-13 05:01:38 +00:00
|
|
|
"--find-copies-harder" option is used) are considered as candidates
|
2005-10-29 04:15:49 +00:00
|
|
|
of the source files in rename/copy operation. If the input were like
|
|
|
|
these filepairs, that talk about a modified file fileY and a newly
|
2005-06-05 21:30:58 +00:00
|
|
|
created file file0:
|
|
|
|
|
2005-08-30 20:51:01 +00:00
|
|
|
------------------------------------------------
|
|
|
|
:100644 100644 0123456... 1234567... M fileY
|
2005-10-29 04:15:49 +00:00
|
|
|
:000000 100644 0000000... bcd3456... A file0
|
2005-08-30 20:51:01 +00:00
|
|
|
------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
the original contents of fileY and the resulting contents of
|
|
|
|
file0 are compared, and if they are similar enough, they are
|
|
|
|
changed to:
|
|
|
|
|
2005-08-30 20:51:01 +00:00
|
|
|
------------------------------------------------
|
|
|
|
:100644 100644 0123456... 1234567... M fileY
|
2005-10-29 04:15:49 +00:00
|
|
|
:100644 100644 0123456... bcd3456... C100 fileY file0
|
2005-08-30 20:51:01 +00:00
|
|
|
------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
In both rename and copy detection, the same "extent of changes"
|
|
|
|
algorithm used in diffcore-break is used to determine if two
|
|
|
|
files are "similar enough", and can be customized to use
|
2005-10-29 04:15:49 +00:00
|
|
|
a similarity score different from the default of 50% by giving a
|
|
|
|
number after the "-M" or "-C" option (e.g. "-M8" to tell it to use
|
2005-06-05 21:30:58 +00:00
|
|
|
8/10 = 80%).
|
|
|
|
|
2021-02-14 07:51:50 +00:00
|
|
|
Note that when rename detection is on but both copy and break
|
|
|
|
detection are off, rename detection adds a preliminary step that first
|
|
|
|
checks if files are moved across directories while keeping their
|
|
|
|
filename the same. If there is a file added to a directory whose
|
2023-10-08 06:45:09 +00:00
|
|
|
contents are sufficiently similar to a file with the same name that got
|
2021-02-14 07:51:50 +00:00
|
|
|
deleted from a different directory, it will mark them as renames and
|
|
|
|
exclude them from the later quadratic step (the one that pairwise
|
|
|
|
compares all unmatched files to find the "best" matches, determined by
|
|
|
|
the highest content similarity). So, for example, if a deleted
|
|
|
|
docs/ext.txt and an added docs/config/ext.txt are similar enough, they
|
|
|
|
will be marked as a rename and prevent an added docs/ext.md that may
|
|
|
|
be even more similar to the deleted docs/ext.txt from being considered
|
|
|
|
as the rename destination in the later step. For this reason, the
|
|
|
|
preliminary "match same filename" step uses a bit higher threshold to
|
|
|
|
mark a file pair as a rename and stop considering other candidates for
|
|
|
|
better matches. At most, one comparison is done per file in this
|
|
|
|
preliminary pass; so if there are several remaining ext.txt files
|
|
|
|
throughout the directory hierarchy after exact rename detection, this
|
diffcore-rename: use directory rename guided basename comparisons
A previous commit noted that it is very common for people to move files
across directories while keeping their filename the same. The last few
commits took advantage of this and showed that we can accelerate rename
detection significantly using basenames; since files with the same
basename serve as likely rename candidates, we can check those first and
remove them from the rename candidate pool if they are sufficiently
similar.
Unfortunately, the previous optimization was limited by the fact that
the remaining basenames after exact rename detection are not always
unique. Many repositories have hundreds of build files with the same
name (e.g. Makefile, .gitignore, build.gradle, etc.), and may even have
hundreds of source files with the same name. (For example, the linux
kernel has 100 setup.c, 87 irq.c, and 112 core.c files. A repository at
$DAYJOB has a lot of ObjectFactory.java and Plugin.java files).
For these files with non-unique basenames, we are faced with the task of
attempting to determine or guess which directory they may have been
relocated to. Such a task is precisely the job of directory rename
detection. However, there are two catches: (1) the directory rename
detection code has traditionally been part of the merge machinery rather
than diffcore-rename.c, and (2) directory rename detection currently
runs after regular rename detection is complete. The 1st catch is just
an implementation issue that can be overcome by some code shuffling.
The 2nd requires us to add a further approximation: we only have access
to exact renames at this point, so we need to do directory rename
detection based on just exact renames. In some cases we won't have
exact renames, in which case this extra optimization won't apply. We
also choose to not apply the optimization unless we know that the
underlying directory was removed, which will require extra data to be
passed in to diffcore_rename_extended(). Also, even if we get a
prediction about which directory a file may have relocated to, we will
still need to check to see if there is a file in the predicted
directory, and then compare the two files to see if they meet the higher
min_basename_score threshold required for marking the two files as
renames.
This commit introduces an idx_possible_rename() function which will
do this directory rename detection for us and give us the index within
rename_dst of the resulting filename. For now, this function is
hardcoded to return -1 (not found) and just hooks up how its results
would be used once we have a more complete implementation in place.
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-02-27 00:30:39 +00:00
|
|
|
preliminary step may be skipped for those files.
|
2021-02-14 07:51:50 +00:00
|
|
|
|
docs: stop using asciidoc no-inline-literal
In asciidoc 7, backticks like `foo` produced a typographic
effect, but did not otherwise affect the syntax. In asciidoc
8, backticks introduce an "inline literal" inside which markup
is not interpreted. To keep compatibility with existing
documents, asciidoc 8 has a "no-inline-literal" attribute to
keep the old behavior. We enabled this so that the
documentation could be built on either version.
It has been several years now, and asciidoc 7 is no longer
in wide use. We can now decide whether or not we want
inline literals on their own merits, which are:
1. The source is much easier to read when the literal
contains punctuation. You can use `master~1` instead
of `master{tilde}1`.
2. They are less error-prone. Because of point (1), we
tend to make mistakes and forget the extra layer of
quoting.
This patch removes the no-inline-literal attribute from the
Makefile and converts every use of backticks in the
documentation to an inline literal (they must be cleaned up,
or the example above would literally show "{tilde}" in the
output).
Problematic sites were found by grepping for '`.*[{\\]' and
examined and fixed manually. The results were then verified
by comparing the output of "html2text" on the set of
generated html pages. Doing so revealed that in addition to
making the source more readable, this patch fixes several
formatting bugs:
- HTML rendering used the ellipsis character instead of
literal "..." in code examples (like "git log A...B")
- some code examples used the right-arrow character
instead of '->' because they failed to quote
- api-config.txt did not quote tilde, and the resulting
HTML contained a bogus snippet like:
<tt><sub></tt> foo <tt></sub>bar</tt>
which caused some parsers to choke and omit whole
sections of the page.
- git-commit.txt confused ``foo`` (backticks inside a
literal) with ``foo'' (matched double-quotes)
- mentions of `A U Thor <author@example.com>` used to
erroneously auto-generate a mailto footnote for
author@example.com
- the description of --word-diff=plain incorrectly showed
the output as "[-removed-] and {added}", not "{+added+}".
- using "prime" notation like:
commit `C` and its replacement `C'`
confused asciidoc into thinking that everything between
the first backtick and the final apostrophe were meant
to be inside matched quotes
- asciidoc got confused by the escaping of some of our
asterisks. In particular,
`credential.\*` and `credential.<url>.\*`
properly escaped the asterisk in the first case, but
literally passed through the backslash in the second
case.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-26 08:51:57 +00:00
|
|
|
Note. When the "-C" option is used with `--find-copies-harder`
|
2010-01-09 23:33:00 +00:00
|
|
|
option, 'git diff-{asterisk}' commands feed unmodified filepairs to
|
2005-06-19 20:14:53 +00:00
|
|
|
diffcore mechanism as well as modified ones. This lets the copy
|
|
|
|
detector consider unmodified files as copy source candidates at
|
docs: stop using asciidoc no-inline-literal
In asciidoc 7, backticks like `foo` produced a typographic
effect, but did not otherwise affect the syntax. In asciidoc
8, backticks introduce an "inline literal" inside which markup
is not interpreted. To keep compatibility with existing
documents, asciidoc 8 has a "no-inline-literal" attribute to
keep the old behavior. We enabled this so that the
documentation could be built on either version.
It has been several years now, and asciidoc 7 is no longer
in wide use. We can now decide whether or not we want
inline literals on their own merits, which are:
1. The source is much easier to read when the literal
contains punctuation. You can use `master~1` instead
of `master{tilde}1`.
2. They are less error-prone. Because of point (1), we
tend to make mistakes and forget the extra layer of
quoting.
This patch removes the no-inline-literal attribute from the
Makefile and converts every use of backticks in the
documentation to an inline literal (they must be cleaned up,
or the example above would literally show "{tilde}" in the
output).
Problematic sites were found by grepping for '`.*[{\\]' and
examined and fixed manually. The results were then verified
by comparing the output of "html2text" on the set of
generated html pages. Doing so revealed that in addition to
making the source more readable, this patch fixes several
formatting bugs:
- HTML rendering used the ellipsis character instead of
literal "..." in code examples (like "git log A...B")
- some code examples used the right-arrow character
instead of '->' because they failed to quote
- api-config.txt did not quote tilde, and the resulting
HTML contained a bogus snippet like:
<tt><sub></tt> foo <tt></sub>bar</tt>
which caused some parsers to choke and omit whole
sections of the page.
- git-commit.txt confused ``foo`` (backticks inside a
literal) with ``foo'' (matched double-quotes)
- mentions of `A U Thor <author@example.com>` used to
erroneously auto-generate a mailto footnote for
author@example.com
- the description of --word-diff=plain incorrectly showed
the output as "[-removed-] and {added}", not "{+added+}".
- using "prime" notation like:
commit `C` and its replacement `C'`
confused asciidoc into thinking that everything between
the first backtick and the final apostrophe were meant
to be inside matched quotes
- asciidoc got confused by the escaping of some of our
asterisks. In particular,
`credential.\*` and `credential.<url>.\*`
properly escaped the asterisk in the first case, but
literally passed through the backslash in the second
case.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-26 08:51:57 +00:00
|
|
|
the expense of making it slower. Without `--find-copies-harder`,
|
2010-01-09 23:33:00 +00:00
|
|
|
'git diff-{asterisk}' commands can detect copies only if the file that was
|
2005-06-19 20:14:53 +00:00
|
|
|
copied happened to have been modified in the same changeset.
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
|
2017-02-28 08:59:05 +00:00
|
|
|
diffcore-merge-broken: For Putting Complete Rewrites Back Together
|
|
|
|
------------------------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
This transformation is used to merge filepairs broken by
|
2005-10-05 22:08:26 +00:00
|
|
|
diffcore-break, and not transformed into rename/copy by
|
2005-06-05 21:30:58 +00:00
|
|
|
diffcore-rename, back into a single modification. This always
|
|
|
|
runs when diffcore-break is used.
|
|
|
|
|
|
|
|
For the purpose of merging broken filepairs back, it uses a
|
|
|
|
different "extent of changes" computation from the ones used by
|
|
|
|
diffcore-break and diffcore-rename. It counts only the deletion
|
|
|
|
from the original, and does not count insertion. If you removed
|
|
|
|
only 10 lines from a 100-line document, even if you added 910
|
|
|
|
new lines to make a new 1000-line document, you did not do a
|
|
|
|
complete rewrite. diffcore-break breaks such a case in order to
|
|
|
|
help diffcore-rename to consider such filepairs as candidate of
|
|
|
|
rename/copy detection, but if filepairs broken that way were not
|
|
|
|
matched with other filepairs to create rename/copy, then this
|
|
|
|
transformation merges them back into the original
|
|
|
|
"modification".
|
|
|
|
|
|
|
|
The "extent of changes" parameter can be tweaked from the
|
|
|
|
default 80% (that is, unless more than 80% of the original
|
|
|
|
material is deleted, the broken pairs are merged back into a
|
|
|
|
single modification) by giving a second number to -B option,
|
|
|
|
like these:
|
|
|
|
|
2005-08-30 20:51:01 +00:00
|
|
|
* -B50/60 (give 50% "break score" to diffcore-break, use 60%
|
|
|
|
for diffcore-merge-broken).
|
|
|
|
|
|
|
|
* -B/60 (the same as above, since diffcore-break defaults to 50%).
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2023-10-08 06:45:14 +00:00
|
|
|
Note that earlier implementation left a broken pair as separate
|
2005-10-05 22:08:26 +00:00
|
|
|
creation and deletion patches. This was an unnecessary hack and
|
2005-06-19 20:17:50 +00:00
|
|
|
the latest implementation always merges all the broken pairs
|
|
|
|
back into modifications, but the resulting patch output is
|
2005-10-05 22:08:26 +00:00
|
|
|
formatted differently for easier review in case of such
|
2005-06-19 20:17:50 +00:00
|
|
|
a complete rewrite by showing the entire contents of old version
|
|
|
|
prefixed with '-', followed by the entire contents of new
|
|
|
|
version prefixed with '+'.
|
|
|
|
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2005-10-29 04:15:49 +00:00
|
|
|
diffcore-pickaxe: For Detecting Addition/Deletion of Specified String
|
2005-10-29 07:50:42 +00:00
|
|
|
---------------------------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2013-05-31 12:12:15 +00:00
|
|
|
This transformation limits the set of filepairs to those that change
|
|
|
|
specified strings between the preimage and the postimage in a certain
|
|
|
|
way. -S<block of text> and -G<regular expression> options are used to
|
|
|
|
specify different ways these strings are sought.
|
|
|
|
|
|
|
|
"-S<block of text>" detects filepairs whose preimage and postimage
|
|
|
|
have different number of occurrences of the specified block of text.
|
|
|
|
By definition, it will not detect in-file moves. Also, when a
|
|
|
|
changeset moves a file wholesale without affecting the interesting
|
|
|
|
string, diffcore-rename kicks in as usual, and `-S` omits the filepair
|
|
|
|
(since the number of occurrences of that string didn't change in that
|
|
|
|
rename-detected filepair). When used with `--pickaxe-regex`, treat
|
|
|
|
the <block of text> as an extended POSIX regular expression to match,
|
|
|
|
instead of a literal string.
|
|
|
|
|
|
|
|
"-G<regular expression>" (mnemonic: grep) detects filepairs whose
|
|
|
|
textual diff has an added or a deleted line that matches the given
|
|
|
|
regular expression. This means that it will detect in-file (or what
|
|
|
|
rename-detection considers the same file) moves, which is noise. The
|
|
|
|
implementation runs diff twice and greps, and this can be quite
|
2018-12-14 18:49:12 +00:00
|
|
|
expensive. To speed things up binary files without textconv filters
|
|
|
|
will be ignored.
|
2013-05-31 12:12:15 +00:00
|
|
|
|
|
|
|
When `-S` or `-G` are used without `--pickaxe-all`, only filepairs
|
|
|
|
that match their respective criterion are kept in the output. When
|
|
|
|
`--pickaxe-all` is used, if even one filepair matches their respective
|
|
|
|
criterion in a changeset, the entire changeset is kept. This behavior
|
|
|
|
is designed to make reviewing changes in the context of the whole
|
2005-06-05 21:30:58 +00:00
|
|
|
changeset easier.
|
|
|
|
|
2005-10-29 04:15:49 +00:00
|
|
|
diffcore-order: For Sorting the Output Based on Filenames
|
2005-10-29 07:50:42 +00:00
|
|
|
---------------------------------------------------------
|
2005-06-05 21:30:58 +00:00
|
|
|
|
|
|
|
This is used to reorder the filepairs according to the user's
|
|
|
|
(or project's) taste, and is controlled by the -O option to the
|
2010-01-09 23:33:00 +00:00
|
|
|
'git diff-{asterisk}' commands.
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2005-10-29 04:15:49 +00:00
|
|
|
This takes a text file each of whose lines is a shell glob
|
2005-06-05 21:30:58 +00:00
|
|
|
pattern. Filepairs that match a glob pattern on an earlier line
|
|
|
|
in the file are output before ones that match a later line, and
|
|
|
|
filepairs that do not match any glob pattern are output last.
|
|
|
|
|
2013-01-21 19:17:53 +00:00
|
|
|
As an example, a typical orderfile for the core Git probably
|
2005-08-30 20:51:01 +00:00
|
|
|
would look like this:
|
2005-06-05 21:30:58 +00:00
|
|
|
|
2005-08-30 20:51:01 +00:00
|
|
|
------------------------------------------------
|
2005-10-03 17:16:30 +00:00
|
|
|
README
|
|
|
|
Makefile
|
|
|
|
Documentation
|
|
|
|
*.h
|
|
|
|
*.c
|
|
|
|
t
|
2005-08-30 20:51:01 +00:00
|
|
|
------------------------------------------------
|
2008-06-06 07:07:28 +00:00
|
|
|
|
diff: --{rotate,skip}-to=<path>
In the implementation of "git difftool", there is a case where the
user wants to start viewing the diffs at a specific path and
continue on to the rest, optionally wrapping around to the
beginning. Since it is somewhat cumbersome to implement such a
feature as a post-processing step of "git diff" output, let's
support it internally with two new options.
- "git diff --rotate-to=C", when the resulting patch would show
paths A B C D E without the option, would "rotate" the paths to
shows patch to C D E A B instead. It is an error when there is
no patch for C is shown.
- "git diff --skip-to=C" would instead "skip" the paths before C,
and shows patch to C D E. Again, it is an error when there is no
patch for C is shown.
- "git log [-p]" also accepts these two options, but it is not an
error if there is no change to the specified path. Instead, the
set of output paths are rotated or skipped to the specified path
or the first path that sorts after the specified path.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-02-11 19:57:50 +00:00
|
|
|
diffcore-rotate: For Changing At Which Path Output Starts
|
|
|
|
---------------------------------------------------------
|
|
|
|
|
|
|
|
This transformation takes one pathname, and rotates the set of
|
|
|
|
filepairs so that the filepair for the given pathname comes first,
|
|
|
|
optionally discarding the paths that come before it. This is used
|
|
|
|
to implement the `--skip-to` and the `--rotate-to` options. It is
|
|
|
|
an error when the specified pathname is not in the set of filepairs,
|
|
|
|
but it is not useful to error out when used with "git log" family of
|
|
|
|
commands, because it is unreasonable to expect that a given path
|
|
|
|
would be modified by each and every commit shown by the "git log"
|
|
|
|
command. For this reason, when used with "git log", the filepair
|
|
|
|
that sorts the same as, or the first one that sorts after, the given
|
|
|
|
pathname is where the output starts.
|
|
|
|
|
|
|
|
Use of this transformation combined with diffcore-order will produce
|
|
|
|
unexpected results, as the input to this transformation is likely
|
|
|
|
not sorted when diffcore-order is in effect.
|
|
|
|
|
|
|
|
|
2008-06-06 07:07:28 +00:00
|
|
|
SEE ALSO
|
|
|
|
--------
|
|
|
|
linkgit:git-diff[1],
|
|
|
|
linkgit:git-diff-files[1],
|
|
|
|
linkgit:git-diff-index[1],
|
|
|
|
linkgit:git-diff-tree[1],
|
|
|
|
linkgit:git-format-patch[1],
|
|
|
|
linkgit:git-log[1],
|
|
|
|
linkgit:gitglossary[7],
|
|
|
|
link:user-manual.html[The Git User's Manual]
|
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
2017-02-09 01:29:30 +00:00
|
|
|
Part of the linkgit:git[1] suite
|