mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-18 23:14:51 +01:00

39 lines

405 B

Text

Raw Normal View History

diff: support --cached on unborn branches "git diff --cached" (without revision) used to mean "git diff --cached HEAD" (i.e. the user was too lazy to type HEAD). This "correctly" failed when there was no commit yet. But was that correctness useful? This patch changes the definition of what particular command means. It is a request to show what _would_ be committed without further "git add". The internal implementation is the same "git diff --cached HEAD" when HEAD exists, but when there is no commit yet, it compares the index with an empty tree object to achieve the desired result. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-02-03 07:23:34 +01:00			`diff --git a/dir/sub b/dir/sub`
			`new file mode 100644`
			`index 0000000..992913c`
			`--- /dev/null`
			`+++ b/dir/sub`
			`@@ -0,0 +1,8 @@`
			`+A`
			`+B`
			`+C`
			`+D`
			`+E`
			`+F`
			`+1`
			`+2`
			`diff --git a/file0 b/file0`
			`new file mode 100644`
			`index 0000000..10a8a9f`
			`--- /dev/null`
			`+++ b/file0`
			`@@ -0,0 +1,9 @@`
			`+1`
			`+2`
			`+3`
			`+4`
			`+5`
			`+6`
			`+A`
			`+B`
			`+C`
			`diff --git a/file1 b/file1`
			`new file mode 100644`
			`index 0000000..b1e6722`
			`--- /dev/null`
			`+++ b/file1`
			`@@ -0,0 +1,3 @@`
			`+A`
			`+B`
			`+C`