{"thread":{"id":"495","subject":"tool to diff cache <-> working directory","startedAt":"2005-05-06T00:23:47Z","lastAt":"2005-05-06T03:13:16Z","messageCount":5,"participants":["Thomas Glanzmann","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"2644","messageId":"20050506002347.GU20994@cip.informatik.uni-erlangen.de","threadId":"495","inReplyTo":null,"subject":"tool to diff cache <-> working directory","fromName":"Thomas Glanzmann","fromEmail":"sithglan@stud.uni-erlangen.de","sentAt":"2005-05-06T00:23:47Z","receivedAt":"2005-05-06T00:23:47Z","isPatch":false,"sender":{"key":"sithglan@stud.uni-erlangen.de","avatar":null},"body":"Hello,\nis there a tool to compare cache with working directory similiar to\ndiff-tree, diff-cache and diff-files? Or is there a way to find out the\nSHA checksum of a file in a working directory without adding it to a\ntemporary cache?\n\n\tThomas\n"},{"id":"2646","messageId":"7vhdhhf88u.fsf@assigned-by-dhcp.cox.net","threadId":"495","inReplyTo":"20050506002347.GU20994@cip.informatik.uni-erlangen.de","subject":"Re: tool to diff cache <-> working directory","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-05-06T01:33:53Z","receivedAt":"2005-05-06T01:33:53Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":">>>>> \"TG\" == Thomas Glanzmann writes:\n\nTG> Is there a tool to compare cache with working directory\nTG> similiar to diff-tree, diff-cache and diff-files?\n\n git-diff-tree tree1 tree2 two trees\n git-diff-cache --cached tree1\tcache and tree\n git-diff-cache tree1\t\ttree and working directory\n git-diff-files cache and working directory\n\nSo git-diff-files is not just similar to but exactly is what you\nwant if I read your question correctly.\n\nTG> Or is there a way to find out the SHA checksum of a file in\nTG> a working directory without adding it to a temporary cache?\n\nYes there is a way, git-write-blob, but why would you want to do\nthat?\n\n\n"},{"id":"2648","messageId":"20050506020759.GA11506@cip.informatik.uni-erlangen.de","threadId":"495","inReplyTo":"7vhdhhf88u.fsf@assigned-by-dhcp.cox.net","subject":"Re: tool to diff cache <-> working directory","fromName":"Thomas Glanzmann","fromEmail":"sithglan@stud.uni-erlangen.de","sentAt":"2005-05-06T02:07:59Z","receivedAt":"2005-05-06T02:07:59Z","isPatch":false,"sender":{"key":"sithglan@stud.uni-erlangen.de","avatar":null},"body":"Hello,\n\n> git-diff-tree tree1 tree2 two trees\n> git-diff-cache --cached tree1\t cache and tree\n> git-diff-cache tree1\t\t tree and working directory\n> git-diff-files cache and working directory\n\nthat makes it clear. Thanks.\n\n> So git-diff-files is not just similar to but exactly is what you\n> want if I read your question correctly.\n\nYes, it is. :-)\n\n> Yes there is a way, git-write-blob, but why would you want to do\n> that?\n\nI thought there would be no cache<->working directory delta generation.\nAnd I need a way to see if there are unchecked-in deltas in the working\ntree. So I thought about looking at the 'git-diff-cache --cached tree1'\nand comparing it with the self generated SHAs of the working tree. But\nnow, that there is such a tool, I am perfectly fine.\n\nThanks,\n\tThomas\n"},{"id":"2649","messageId":"7vy8atdq7i.fsf@assigned-by-dhcp.cox.net","threadId":"495","inReplyTo":"20050506020759.GA11506@cip.informatik.uni-erlangen.de","subject":"Re: tool to diff cache <-> working directory","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-05-06T02:48:49Z","receivedAt":"2005-05-06T02:48:49Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":">>>>> \"TG\" == Thomas Glanzmann writes:\n\nTG> I thought there would be no cache<->working directory delta generation.\nTG> And I need a way to see if there are unchecked-in deltas in the working\nTG> tree. So I thought about looking at the 'git-diff-cache --cached tree1'\nTG> and comparing it with the self generated SHAs of the working tree. But\nTG> now, that there is such a tool, I am perfectly fine.\n\nAre you using pure GIT, without any Porcelain layer like Cogito?\n\nCogito has \"cg-status\" that shows something like \"cvs -n update\"\noutput.\n\nMy (shameless plug ;-) JIT [*1*] also has \"jit-status\".\n\n[References]\n*1* http://members.cox.net/junkio/\n\n"},{"id":"2652","messageId":"20050506031316.GB11506@cip.informatik.uni-erlangen.de","threadId":"495","inReplyTo":"7vy8atdq7i.fsf@assigned-by-dhcp.cox.net","subject":"Re: tool to diff cache <-> working directory","fromName":"Thomas Glanzmann","fromEmail":"sithglan@stud.uni-erlangen.de","sentAt":"2005-05-06T03:13:16Z","receivedAt":"2005-05-06T03:13:16Z","isPatch":false,"sender":{"key":"sithglan@stud.uni-erlangen.de","avatar":null},"body":"Hello,\n\n> Are you using pure GIT, without any Porcelain layer like Cogito?\n\nno, I actually write a porcelain layer myself in perl. For several reasons:\n\n\t- I want something that runs on Solaris without gnu-utils\n\t- I want to understand the git internals.\n\t- I don't need branches and refs in .git\n\n> Cogito has \"cg-status\" that shows something like \"cvs -n update\"\n> output.\n\nI just finished implementing my 'git status' command which does the\nfollowing:\n\n\t(faui01) [~/work/git/git] git status\n\t + 1\n\t ? 2\n\t - COPYING\n\tD* Makefile\n\t * commit.c\n\tD export.c\n\n\t+/-/* -> add, rm, mod\n\t? -> orphan (not under revision control)\n\tD -> dirty -> was explicit modified in cache but cache doesn't match working copy\n\nI also have a ignore list for known orphans:\n\n\t(faui01) [~/work/git/git] cat .git/ignore\n\t\\.o$\n\tgit-cat-file\n\t...\n\tgit-write-tree\n\tlibgit.a\n\nSincerely,\n\tThomas\n"}]}