Nitish, I just get "error: unknown switch `a'" when appending -a. On Monday 11 April 2011 10:28:32 Nitish Kumar wrote:

I am new to git. I have not tried to mass add the files using git add ...

For time being, until someone comes with better answer, you can probably use: git add fb.process.inc -a git add fb_tab.js -a

Regards, Nitish

If you look at the "Git instructions" tab for the project you're working on I think you'll find more mature instructions for patch creation. When you find a git documentation problem like this, please file an issue at http://drupal.org/project/issues/git_dev My approaches to patch creation: http://randyfay.com/node/97 -Randy On Mon, Apr 11, 2011 at 11:28 AM, Kyle Mathews <mathews.kyle@gmail.com>wrote:

Hmm... well those instructions are wrong I guess.

"git diff" is the diff of changes since the last commit that have *not*been staged. So once you've added a file via "git add", it won't show up anymore when you run "git diff".

If you want to see the diff between the last commit and staged files, run "git diff --cached"

-- Kyle Mathews

Blog: kyle.mathews2000.com/blog Twitter: http://twitter.com/kylemathews

On Mon, Apr 11, 2011 at 10:16 AM, Dave Cohen <drupal@dave-cohen.com>wrote:

...

I'm trying, and failing, to create a patch that adds new files to a module.

According to http://drupal.org/node/707484, I should simply run `git add ...` then "Next time you run git diff, these new files will be included as well." In my experience, this statement is false.

When I run `git status`, I see something like this:

[dave@starbuck fb-3]$ git status # On branch 6.x-3.x # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: fb.process.inc # new file: fb_tab.js # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README.txt # modified: contrib/fb_example.module # modified: fb.module # modified: fb_canvas.admin.inc # modified: fb_canvas.module # modified: fb_devel.module # modified: fb_settings.inc # modified: fb_tab.admin.inc # modified: fb_tab.info # modified: fb_tab.module # modified: fb_url_rewrite.inc

When I run `git diff`, I see changes to all the modified files, but I do not see the new files.

What am I missing? Thanks,

-Dave

-- Randy Fay Drupal Module and Site Development randy@randyfay.com +1 970.462.7450

On 04/11/2011 02:53 PM, Dave Cohen wrote:

I suppose if you're a fan of git, you can argue that it is always right.

I'm no more a"fan" of git than i am of drupal. Its a tool that has good value if you know how to use it and can frustrate the hell out of you if you dont.

If you're like me, on the other hand, you might expect something to show up in git diff, after you've run git add. It just has one more layer of intelligence/workflow that allows it/you to ignore changes in your working copy that you don't want to pay attention right now. If you're like me and have a couple things going on at once and want to commit your work in atomic chunks you can find it useful. If not there are git shortcuts for commits to ignore the whole layer.

...

To do what you want above, just temporarily tell git to care about your new files with "git add ." or listing them by name and then run "git diff HEAD". I find that "git diff HEAD" is wrong because I'm not working on HEAD. Similarly, "git diff origin" does not do the right thing. You find that its wrong or it doesnt work? These are two different things.

HEAD is a special dynamic variable that refers to the most recent commit in the index. It is there so you don't have to type in the whole commits crazy ass SHA name. In that way it works EXACTLY like a named version tag. (fyi HEAD^ equals "next to last commit" so git "diff HEAD^ HEAD" shows you the diff between the last commit and the one before it). You can see what this is by interrogating the HEAD file in .git manually for fun. HEAD isnt a branch name like master or |6.x-3.x. Though i can see the point of confusion if im understanding you correctly. | -- Michael Favia michael@favish.com tel. 512.669.5650 http://www.favish.com

On 04/11/2011 03:32 PM, Dave Cohen wrote:

On Monday 11 April 2011 13:09:20 Michael Favia wrote:

...

I'm no more a"fan" of git than i am of drupal. Its a tool that has good value if you know how to use it and can frustrate the hell out of you if you dont. Let's just say it frustrates the hell out of me. :) So did drupal at first for me at least but we've grown accustomed to each other over the last 5 years. :)

git diff origin<--- does the wrong thing, in my case git diff HEAD<--- appears to work git diff origin/6.x-3.x<-- appears to work, in my case Your "origin" is a reference to a remote repository. That repository has a "default branch". It seems, at least in this case, that this default branch is NOT 6.x-3.x. This explains why the former failed and the latter worked for you. It probably looked like a ton of changes because it was set to the 7 branch or something :). The HEAD comparison is entirely local and what you really wanted to use anyway you cut it.

Thanks for explaining that. Anytime bud. You've saved me days with fb and associated work. Happy to help. if you ever run into specific issues hit me up in IRC.

-- Michael Favia michael@favish.com tel. 512.669.5650 http://www.favish.com

Dev list: Yeah I've definitely learned that you might be much better off using the 'create branches for features and delete them when done, or make them public to allow people to help' method rather than the old CVS 'make changes and then a patch' method of development. It's a transition, but I think it works really well once you get used to it. And I'm one of the biggest CVS curmudgeons in Drupal. Dave Reid dave@davereid.net On Mon, Apr 11, 2011 at 4:42 PM, Bob Hutchinson <hutchlists@midwales.com>wrote:

On Monday 11 April 2011, Dave Cohen wrote:

...

I'm trying, and failing, to create a patch that adds new files to a module.

Here is a simple way to pull together a patch on a drupal project.

Create a new directory, let's call it 'git-sandbox' cd into it and run something like this:

git clone --branch 6.x-3.x http://git.drupal.org/project/mymodule.git

This will create a directory 'mymodule' (or whatever you fetched)

copy your changed files into it and run

git diff > mymodule.patch

if you are adding new files copy them in and run 'add .'

cd in and run

git diff --staged > mymodule.patch

To do both at the same time

git diff HEAD > mymodule.patch

As Sam Boyer explains earlier in this thread.

open the patchfile in your editor and eyeball to see if it makes any sense

If that's OK copy the patchfile away somewhere and delete the whole mymodule directory and run the git clone command again, copy the patchfile back in and run

git apply mymodule.patch or patch -p1 < mymodule.patch

if it applies cleanly you are ready to upload the patch to the issue queue or wherever.

Of course a git clone run using http cannot be used for commits so it is 'safer' as it were.

You can also do all this and a lot more using a tool like Smartgit though many would argue that learning it on the command line is better for understanding it, true enough.

Another *big* help is to install the git docs (as well as php, mysql etc) on your devbox.

Hope this helps.

...

According to http://drupal.org/node/707484, I should simply run `git add ...` then "Next time you run git diff, these new files will be included

as

...

well." In my experience, this statement is false.

When I run `git status`, I see something like this:

[dave@starbuck fb-3]$ git status # On branch 6.x-3.x # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: fb.process.inc # new file: fb_tab.js # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README.txt # modified: contrib/fb_example.module # modified: fb.module # modified: fb_canvas.admin.inc # modified: fb_canvas.module # modified: fb_devel.module # modified: fb_settings.inc # modified: fb_tab.admin.inc # modified: fb_tab.info # modified: fb_tab.module # modified: fb_url_rewrite.inc

When I run `git diff`, I see changes to all the modified files, but I do not see the new files.

What am I missing? Thanks,

-Dave

-- ----------------- Bob Hutchinson Midwales dot com -----------------