git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Diff between the non-head git work dir and non-git kernel sources

From
Llamikr <lamikr@cc.jyu.fi>
Date
Nov 8, 2005, 20:54 UTC
Message-ID
<43711088.6070701@cc.jyu.fi>
Hi

I am sorry if this a newbie question, but I have tried to read howtos from the web without finding clear documentation or howto to following kind of problem.

I have checked out the omap git tree with command
    git-clone rsync://source.mvista.com/git/linux-omap-2.6.git 
linux-omap-2.6

and now I am obviously having the omap kernel head in the linux-omap-2.6 working directory + hidden ".git" with commit history. In addition I have my own "non git" development tree that is made on top of traditional kernel snapshots. I however know that the sources in this dir reflects to state in git history when following patch was committed

    
http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff;h=d24aff0bd3e788d69a45a9d1b1eecda88d847a41

I would now like to revert the sources in git working dir to state that was after this d24aff0bd3e788d69a45a9d1b1eecda88d847a41 commit and then make the diff between that kernel source version and my non-git source version and I am now trying to find out what is the "correct" way of doing this.

1) If understood the documentation correctly I could move the working 
dir to contain the state after
d24aff0bd3e788d69a45a9d1b1eecda88d847a41 commit in a following way
a) open qgit and mark correct commit with "make tag mytag" command
b) change the files in working dir to be same than during the "mytag" 
commit time by using command git checkout -f mytag
   
Are there simpler method for doing this that uses commit id 
d24aff0bd3e788d69a45a9d1b1eecda88d847a41 directly without need to make 
tag or branch?
2) Does git-diff support making the diff between git's working dir and 
"my non" git kernel source dir.
Or should I just just use normal diff and order that to ignore .git dir 
and .gitignore files?
Mika
Next: Junio C Hamano
Message 1 of 3 in “Diff between the non-head git work dir and non-git kernel sources”
  1. lamikrNov 8, 2005
  2. Junio C HamanoNov 8, 2005
  3. lamikrNov 8, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.