bash script to pull in branch B the changes from parent branch A

Hi,

I have a bash script to pull in branch B the changes from parent branch A that does the following:

cd repo-in-branchB git branch --set-upstream-to=origin/branchB git pull git branch --set-upstream-to=origin/branchA git pull git branch --set-upstream-to=origin/branchB

It does exactly what I want but, as I have many children branches B to update, I would like to prompt my username and password only once and then makes the script use them in all following git requests. I came to the conclusion that I needed to update my script as follow:

read -p "Username for 'https://github.com': " username read -s -p "Password for 'https://$username@github.com': " password echo "" cd repo-in-branchB echo “pull from branchB" git pull https://$username:$password@github.com/myrepo.git heads/branchB echo “pull from parent branchA" git pull https://$username:$password@github.com/myrepo.git heads/branchA

I have never used this kind of URLs, so just to make sure, are these 2 versions conceptually equivalent? Will they do the exact same thing?

Best regards

Laetitia

PS: I’m open to suggestions but note that I don’t want to rebase, neither can I configure my username and password in a permanent way on this server.

On Wed, 2017-11-22 at 00:19 +0800, Laetitia Pfaender wrote:

It would be nice if you explained in words exactly what it is you want to do.

This seems like a lot more work than necessary. A "git pull" consists of two steps: first a "git fetch" which is the part that actually goes out to the remote and pulls all the new content, and then a merge operation to the remote's version of the current branch.

The "git fetch" is all that needs credentials, and it pulls the entire contents of the repo including all branches, so you only need to do it once.

Is there some reason why you can't do the following:

  cd repo
  git fetch (requires you to enter username/password)
  git merge origin/branchB
  git merge origin/branchA

and just continue to merge for each different branch (without re- running git fetch)?

Don't know how well this works as I don't use HTTPS remotes very much. But note, this will make your username AND password for your GitHub account visible to anyone one the system who happens to run "ps" while your pull command is running.