Created the patch; uploaded it to the issue; and now I want to commit it. I Run git push origin 6.x-1.x and after typing in my password I get a "Everything up-to-date" message. What did I miss here?

Patch I wish to apply:
http://drupal.org/node/1073152#comment-4139650

Comments

franskuipers’s picture

franskuipers commented

Maybe you missed the local commit?

From the Git Instuctions Tab:

Commiting all changes locally

Make your changes. Note the change in syntax for issue-related commit messages. See the Commit messages page for details.

git add -A
git commit -m "Issue #[issue number] by [comma-separated usernames]: [Short summary of the change]."

Pushing your code back to the repository on Drupal.org

git push origin 6.x-1.x
mikeytown2’s picture

mikeytown2 commented

Because I created a new branch just for that patch (following directions to the T) commit only hit the new branch. If I don't branch before then committing the patch I just created works.

I need to switch back to the 6.x branch apply the patch and then commit it.

Documentation could be more clear I guess. Not sure how to word it as I'm very green with git.

MGN’s picture

MGN commented

I had the same experience with my first commit after migrating to git.

Reading further, it seems that after making the new branch for the issue and committing locally, you need to switch back to the 6.x branch, merge in the changes from the new branch, then push up to drupal.org. In my case the new branch was called "default-grade-976024". Here are the steps I followed, starting with the local commit to the new branch.

git commit -m "Issue #976024....
git checkout 6.x-2.x
git diff 6.x-2.x default-grade-976024
git merge default-grade-976024
git push origin 6.x-2.x

This seems to work.

eliza411’s picture

eliza411 commented
Status: Active » Fixed

This looks to be fixed. Please re-open if I'm mistaken.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.