git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* Re: [PATCH] git-diff: Introduce --index and deprecate --cached.
@ 2020-11-10  7:32 Jake Steward
  0 siblings, 0 replies; 5+ messages in thread
From: Jake Steward @ 2020-11-10  7:32 UTC (permalink / raw)
  To: junkio; +Cc: ae, git

[-- Attachment #1: 00b0ac6c22b99900bb49047e2a24bfa35b2fa69c.numbers --]
[-- Type: application/octet-stream, Size: 76661 bytes --]

[-- Attachment #2: Type: text/plain, Size: 21 bytes --]



Sent from my iPhone

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] git-diff: Introduce --index and deprecate --cached.
@ 2021-09-12 21:39 nu ja
  0 siblings, 0 replies; 5+ messages in thread
From: nu ja @ 2021-09-12 21:39 UTC (permalink / raw)
  To: jakesteward0916; +Cc: ae, git, junkio



‫iPhone‬

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] git-diff: Introduce --index and deprecate --cached.
  2006-12-09  2:24 ` Junio C Hamano
@ 2006-12-09  2:29   ` Junio C Hamano
  0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2006-12-09  2:29 UTC (permalink / raw)
  To: Andreas Ericsson; +Cc: git

Junio C Hamano <junkio@cox.net> writes:

> Although I've applied this long time ago (in git timescale
> anyway), this patch and the above rationale is wrong.
>
> 'diff --cached' is more in line with how 'apply --cached' works,
> not how 'apply --index' works.

Side note.  I do not think --index and --cached are a good pair
of words to express the different semantics (the former works on
the working tree through the index, the latter works only on the
cached data and not on the working tree).  I was only pointing
out that making 'diff --index' a synonym to 'diff --cached'
closes the door for the possibility to have these two semantics
that are consistently spelled (well, maybe "confusingly
spelled", but still consistently) between diff and apply.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] git-diff: Introduce --index and deprecate --cached.
  2006-11-30 11:43 Andreas Ericsson
@ 2006-12-09  2:24 ` Junio C Hamano
  2006-12-09  2:29   ` Junio C Hamano
  0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2006-12-09  2:24 UTC (permalink / raw)
  To: Andreas Ericsson; +Cc: git

Andreas Ericsson <ae@op5.se> writes:

> 'git diff --cached' still works, but its use is discouraged
> in the documentation. 'git diff --index' does the same thing
> and is consistent with how 'git apply --index' works.

Although I've applied this long time ago (in git timescale
anyway), this patch and the above rationale is wrong.

'diff --cached' is more in line with how 'apply --cached' works,
not how 'apply --index' works.

With apply, --cached and --index both tell the command to be
aware of the index, but --cached means "operate on the index,
and never look at working tree", while --index means "operate
both on the index and working tree at the same time".  In
particular, the former does not care if the file in the working
tree matches the index, while the latter does.

'diff --cached' is about the tree and the index without looking
at the working tree.  Since there is no mode of operation that
looks at both the index and the working tree in the underlying
diff-index, I made the mistake of applying this patch, but it is
conceivable that we may want to have a 'diff --index' that
compares HEAD, the index and the working tree, perhaps in a
combined diff format.

I think we should revert this patch.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH] git-diff: Introduce --index and deprecate --cached.
@ 2006-11-30 11:43 Andreas Ericsson
  2006-12-09  2:24 ` Junio C Hamano
  0 siblings, 1 reply; 5+ messages in thread
From: Andreas Ericsson @ 2006-11-30 11:43 UTC (permalink / raw)
  To: git

'git diff --cached' still works, but its use is discouraged
in the documentation. 'git diff --index' does the same thing
and is consistent with how 'git apply --index' works.

Signed-off-by: Andreas Ericsson <ae@op5.se>
---
 Documentation/git-diff.txt |    6 ++++--
 builtin-diff.c             |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 228c4d9..3144864 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -22,8 +22,10 @@ the number of trees given to the command.
 
 * When one <tree-ish> is given, the working tree and the named
   tree are compared, using `git-diff-index`.  The option
-  `--cached` can be given to compare the index file and
+  `--index` can be given to compare the index file and
   the named tree.
+  `--cached` is a deprecated alias for `--index`. It's use is
+  discouraged.
 
 * When two <tree-ish>s are given, these two trees are compared
   using `git-diff-tree`.
@@ -47,7 +49,7 @@ Various ways to check your working tree::
 +
 ------------
 $ git diff            <1>
-$ git diff --cached   <2>
+$ git diff --index    <2>
 $ git diff HEAD       <3>
 ------------
 +
diff --git a/builtin-diff.c b/builtin-diff.c
index a659020..1c535b1 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -137,7 +137,7 @@ static int builtin_diff_index(struct rev_info *revs,
 	int cached = 0;
 	while (1 < argc) {
 		const char *arg = argv[1];
-		if (!strcmp(arg, "--cached"))
+		if (!strcmp(arg, "--index") || !strcmp(arg, "--cached"))
 			cached = 1;
 		else
 			usage(builtin_diff_usage);
-- 
1.4.4.1.GIT

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-09-12 21:47 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-10  7:32 [PATCH] git-diff: Introduce --index and deprecate --cached Jake Steward
  -- strict thread matches above, loose matches on Subject: below --
2021-09-12 21:39 nu ja
2006-11-30 11:43 Andreas Ericsson
2006-12-09  2:24 ` Junio C Hamano
2006-12-09  2:29   ` Junio C Hamano

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).