Wireshark · Wireshark-dev: Re: [Wireshark-dev] git doesn't like me anymore

[ajay saxena <aileronajay@xxxxxxxxx>]

Each time you make a change to a file, you need to stage it irrespective of whether the file was present in an earlier commit and was "added" earlier. The staging is done by the git command git add. A staged change needs to be committed to create a commit out of it. So after you run git add, you will need to run git commit to create the commit.

If you run the command git status when you have made changes to a file but not staged it git will display the file in the list of unstaged files.

When you run git status after running git add for the file, git will show the file in the list of staged files

Finally after running the commit command, the changed file wont show up as staged or unstaged files at which point you can push this commit and possibly merge the change in a different branch/repo.

A push is mechanism for you to update the remote copy of your local branch with commits from your local branch.

A pull/merge request helps to merge commits from a given repo/branch into another repo/branch. It also creates a diff between them that helps people to review the changes.

On Sun, Jan 17, 2021 at 4:11 PM Fulko Hew <fulko.hew@xxxxxxxxx> wrote:

On Sun, Jan 17, 2021 at 6:50 PM ajay saxena <aileronajay@xxxxxxxxx> wrote:

You should be able to add your changes to the existing branch by running the following commands. These commands assume you are already on the branch using which you created the PR.

git add updateFileName

Since I only modified an existing file that I had previously added,

I don't think? I need to add the file again.

git commit -m "message"

I did this and it replied about the fact that the one file changed with 'n' additions and deletions.

git push

And that's where I issued git push downstream HEAD (as per the documentation)

If I use a simple 'git push', it tells me I need to do a 'git push upstream HEAD'.

When you push the new commits to your fork that should help to update the pull request. 

To someone like me, who's been a embedded software guy for over 40 years,

(but never a git user) that statement above is confusing...

   'when you push ... it updates the pull...'  ?huh?

P.S.  While waiting for replies to this email, I tried that git push upstream HEAD

command again, but this time it asked for my ID (which it never did before).

I think I've managed to get it wrong 4 times in a row, and now I'm locked out.

Now what can I (also) do to unlock it?

(from bad to worse)  Fulko

On Sun, Jan 17, 2021 at 3:44 PM Fulko Hew <fulko.hew@xxxxxxxxx> wrote:

The subject line says it all, but it doesn't say why.

git and I just don't seem to understand one another.

I've made a new dissector, and I went through the whole process

to clone the repo, add/change my stuff, resync it, and submit

my merge request.  Now the approver(s) asked for some changes,

and although I disagreed with the need for the last one, I've

now made that enhancement too, and want to commit it and have

it merged.

But now after doing the 'git commit -a', the instructions say

I need to do 'git push downstream HEAD', but that returns the

error messages:

fatal: 'downstream' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

I'll admit, I don't understand git, let alone how to use it,

so I need help on what I need to do to get past this issue.

Thanks

Fulko

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe