2023-05-16 06:33:57 +00:00
|
|
|
#include "builtin.h"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.h"
|
2005-04-27 16:21:00 +00:00
|
|
|
#include "diff.h"
|
2021-05-20 21:46:59 +00:00
|
|
|
#include "diff-merges.h"
|
2006-04-22 09:43:00 +00:00
|
|
|
#include "commit.h"
|
2023-05-16 06:33:52 +00:00
|
|
|
#include "preload-index.h"
|
2023-05-16 06:34:00 +00:00
|
|
|
#include "repository.h"
|
2006-04-22 09:43:00 +00:00
|
|
|
#include "revision.h"
|
2023-03-21 06:26:05 +00:00
|
|
|
#include "setup.h"
|
2023-06-29 23:43:20 +00:00
|
|
|
#include "sparse-index.h"
|
2010-08-05 22:40:48 +00:00
|
|
|
#include "submodule.h"
|
2005-04-23 00:15:28 +00:00
|
|
|
|
2005-07-29 09:01:26 +00:00
|
|
|
static const char diff_cache_usage[] =
|
2022-10-13 15:39:13 +00:00
|
|
|
"git diff-index [-m] [--cached] [--merge-base] "
|
2015-01-13 07:44:47 +00:00
|
|
|
"[<common-diff-options>] <tree-ish> [<path>...]"
|
2022-10-13 15:39:01 +00:00
|
|
|
"\n"
|
2005-07-13 19:52:35 +00:00
|
|
|
COMMON_DIFF_OPTIONS_HELP;
|
2005-04-21 02:49:16 +00:00
|
|
|
|
2006-07-29 05:44:25 +00:00
|
|
|
int cmd_diff_index(int argc, const char **argv, const char *prefix)
|
2005-04-20 04:00:09 +00:00
|
|
|
{
|
2006-04-22 09:43:00 +00:00
|
|
|
struct rev_info rev;
|
2020-09-20 11:22:22 +00:00
|
|
|
unsigned int option = 0;
|
2005-05-25 01:10:11 +00:00
|
|
|
int i;
|
2007-03-14 00:17:04 +00:00
|
|
|
int result;
|
2005-04-20 04:00:09 +00:00
|
|
|
|
2017-06-01 04:38:16 +00:00
|
|
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
|
|
|
usage(diff_cache_usage);
|
|
|
|
|
2017-05-08 16:03:37 +00:00
|
|
|
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
|
2018-09-21 15:57:38 +00:00
|
|
|
repo_init_revisions(the_repository, &rev, prefix);
|
2006-04-22 09:43:00 +00:00
|
|
|
rev.abbrev = 0;
|
MacOS: precompose_argv_prefix()
The following sequence leads to a "BUG" assertion running under MacOS:
DIR=git-test-restore-p
Adiarnfd=$(printf 'A\314\210')
DIRNAME=xx${Adiarnfd}yy
mkdir $DIR &&
cd $DIR &&
git init &&
mkdir $DIRNAME &&
cd $DIRNAME &&
echo "Initial" >file &&
git add file &&
echo "One more line" >>file &&
echo y | git restore -p .
Initialized empty Git repository in /tmp/git-test-restore-p/.git/
BUG: pathspec.c:495: error initializing pathspec_item
Cannot close git diff-index --cached --numstat
[snip]
The command `git restore` is run from a directory inside a Git repo.
Git needs to split the $CWD into 2 parts:
The path to the repo and "the rest", if any.
"The rest" becomes a "prefix" later used inside the pathspec code.
As an example, "/path/to/repo/dir-inside-repå" would determine
"/path/to/repo" as the root of the repo, the place where the
configuration file .git/config is found.
The rest becomes the prefix ("dir-inside-repå"), from where the
pathspec machinery expands the ".", more about this later.
If there is a decomposed form, (making the decomposing visible like this),
"dir-inside-rep°a" doesn't match "dir-inside-repå".
Git commands need to:
(a) read the configuration variable "core.precomposeunicode"
(b) precocompose argv[]
(c) precompose the prefix, if there was any
The first commit,
76759c7dff53 "git on Mac OS and precomposed unicode"
addressed (a) and (b).
The call to precompose_argv() was added into parse-options.c,
because that seemed to be a good place when the patch was written.
Commands that don't use parse-options need to do (a) and (b) themselfs.
The commands `diff-files`, `diff-index`, `diff-tree` and `diff`
learned (a) and (b) in
commit 90a78b83e0b8 "diff: run arguments through precompose_argv"
Branch names (or refs in general) using decomposed code points
resulting in decomposed file names had been fixed in
commit 8e712ef6fc97 "Honor core.precomposeUnicode in more places"
The bug report from above shows 2 things:
- more commands need to handle precomposed unicode
- (c) should be implemented for all commands using pathspecs
Solution:
precompose_argv() now handles the prefix (if needed), and is renamed into
precompose_argv_prefix().
Inside this function the config variable core.precomposeunicode is read
into the global variable precomposed_unicode, as before.
This reading is skipped if precomposed_unicode had been read before.
The original patch for preocomposed unicode, 76759c7dff53, placed
precompose_argv() into parse-options.c
Now add it into git.c::run_builtin() as well. Existing precompose
calls in diff-files.c and others may become redundant, and if we
audit the callflows that reach these places to make sure that they
can never be reached without going through the new call added to
run_builtin(), we might be able to remove these existing ones.
But in this commit, we do not bother to do so and leave these
precompose callsites as they are. Because precompose() is
idempotent and can be called on an already precomposed string
safely, this is safer than removing existing calls without fully
vetting the callflows.
There is certainly room for cleanups - this change intends to be a bug fix.
Cleanups needs more tests in e.g. t/t3910-mac-os-precompose.sh, and should
be done in future commits.
[1] git-bugreport-2021-01-06-1209.txt (git can't deal with special characters)
[2] https://lore.kernel.org/git/A102844A-9501-4A86-854D-E3B387D378AA@icloud.com/
Reported-by: Daniel Troger <random_n0body@icloud.com>
Helped-By: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-02-03 16:28:23 +00:00
|
|
|
prefix = precompose_argv_prefix(argc, argv, prefix);
|
2006-04-22 09:43:00 +00:00
|
|
|
|
2021-05-20 21:46:59 +00:00
|
|
|
/*
|
2021-09-01 16:52:20 +00:00
|
|
|
* We need (some of) diff for merges options (e.g., --cc), and we need
|
|
|
|
* to avoid conflict with our own meaning of "-m".
|
2021-05-20 21:46:59 +00:00
|
|
|
*/
|
2021-09-01 16:52:20 +00:00
|
|
|
diff_merges_suppress_m_parsing();
|
2021-05-20 21:46:59 +00:00
|
|
|
|
2006-04-22 09:43:00 +00:00
|
|
|
argc = setup_revisions(argc, argv, &rev, NULL);
|
2005-05-25 01:10:11 +00:00
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
const char *arg = argv[i];
|
2007-06-07 07:04:01 +00:00
|
|
|
|
2006-04-22 10:58:04 +00:00
|
|
|
if (!strcmp(arg, "--cached"))
|
2020-09-20 11:22:22 +00:00
|
|
|
option |= DIFF_INDEX_CACHED;
|
2020-09-20 11:22:25 +00:00
|
|
|
else if (!strcmp(arg, "--merge-base"))
|
|
|
|
option |= DIFF_INDEX_MERGE_BASE;
|
2021-05-20 21:46:59 +00:00
|
|
|
else if (!strcmp(arg, "-m"))
|
|
|
|
rev.match_missing = 1;
|
2006-04-22 09:43:00 +00:00
|
|
|
else
|
2005-09-21 07:00:47 +00:00
|
|
|
usage(diff_cache_usage);
|
2005-04-20 04:00:09 +00:00
|
|
|
}
|
2006-06-24 17:24:14 +00:00
|
|
|
if (!rev.diffopt.output_format)
|
|
|
|
rev.diffopt.output_format = DIFF_FORMAT_RAW;
|
|
|
|
|
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
|
|
|
rev.diffopt.rotate_to_strict = 1;
|
|
|
|
|
2006-04-22 09:43:00 +00:00
|
|
|
/*
|
|
|
|
* Make sure there is one revision (i.e. pending object),
|
|
|
|
* and there is no revision filtering parameters.
|
|
|
|
*/
|
Add "named object array" concept
We've had this notion of a "object_list" for a long time, which eventually
grew a "name" member because some users (notably git-rev-list) wanted to
name each object as it is generated.
That object_list is great for some things, but it isn't all that wonderful
for others, and the "name" member is generally not used by everybody.
This patch splits the users of the object_list array up into two: the
traditional list users, who want the list-like format, and who don't
actually use or want the name. And another class of users that really used
the list as an extensible array, and generally wanted to name the objects.
The patch is fairly straightforward, but it's also biggish. Most of it
really just cleans things up: switching the revision parsing and listing
over to the array makes things like the builtin-diff usage much simpler
(we now see exactly how many members the array has, and we don't get the
objects reversed from the order they were on the command line).
One of the main reasons for doing this at all is that the malloc overhead
of the simple object list was actually pretty high, and the array is just
a lot denser. So this patch brings down memory usage by git-rev-list by
just under 3% (on top of all the other memory use optimizations) on the
mozilla archive.
It does add more lines than it removes, and more importantly, it adds a
whole new infrastructure for maintaining lists of objects, but on the
other hand, the new dynamic array code is pretty obvious. The change to
builtin-diff-tree.c shows a fairly good example of why an array interface
is sometimes more natural, and just much simpler for everybody.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-20 00:42:35 +00:00
|
|
|
if (rev.pending.nr != 1 ||
|
2006-04-22 09:43:00 +00:00
|
|
|
rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
|
2005-04-21 02:49:16 +00:00
|
|
|
usage(diff_cache_usage);
|
2020-09-20 11:22:22 +00:00
|
|
|
if (!(option & DIFF_INDEX_CACHED)) {
|
2008-08-28 13:02:12 +00:00
|
|
|
setup_work_tree();
|
2022-11-19 13:07:38 +00:00
|
|
|
if (repo_read_index_preload(the_repository, &rev.diffopt.pathspec, 0) < 0) {
|
|
|
|
perror("repo_read_index_preload");
|
2012-10-30 09:50:42 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2022-11-19 13:07:38 +00:00
|
|
|
} else if (repo_read_index(the_repository) < 0) {
|
|
|
|
perror("repo_read_index");
|
2007-02-10 02:51:40 +00:00
|
|
|
return -1;
|
|
|
|
}
|
diff: drop useless return from run_diff_{files,index} functions
Neither of these functions ever returns a value other than zero.
Instead, they expect unrecoverable errors to exit immediately, and
things like "--exit-code" are stored inside the diff_options struct to
be handled later via diff_result_code().
Some callers do check the return values, but many don't bother. Let's
drop the useless return values, which are misleading callers about how
the functions work. This could be seen as a step in the wrong direction,
as we might want to eventually "lib-ify" these to more cleanly return
errors up the stack, in which case we'd have to add the return values
back in. But there are some benefits to doing this now:
1. In the current code, somebody could accidentally add a "return -1"
to one of the functions, which would be erroneously ignored by many
callers. By removing the return code, the compiler can notice the
mismatch and force the developer to decide what to do.
Obviously the other option here is that we could start consistently
checking the error code in every caller. But it would be dead code,
and we wouldn't get any compile-time help in catching new cases.
2. It communicates the situation to callers, who may want to choose a
different function. These functions are really thin wrappers for
doing git-diff-files and git-diff-index within the process. But
callers who care about recovering from an error here are probably
better off using the underlying library functions, many of
which do return errors.
If somebody eventually wants to teach these functions to propagate
errors, they'll have to switch back to returning a value, effectively
reverting this patch. But at least then they will be starting with a
level playing field: they know that they will need to inspect each
caller to see how it should handle the error.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-08-21 20:18:55 +00:00
|
|
|
run_diff_index(&rev, option);
|
2023-08-21 20:20:46 +00:00
|
|
|
result = diff_result_code(&rev.diffopt);
|
2022-04-13 20:01:43 +00:00
|
|
|
release_revisions(&rev);
|
|
|
|
return result;
|
2005-04-20 04:00:09 +00:00
|
|
|
}
|