[Pki-devel] REVISED PKI GIT REPOSITORY BRANCH NAMES

Everyone, After numerous discussions, I have renamed the PKI git repository branches following our new naming conventions. The table below identifies the original branch name and its new branch name. Some original branch names were left unchanged. Some other original branches were deleted, and thus have no new branch name. Finally, the new branch entitled 'DOGTAG_10_2_RHEL_BRANCH' was created from the '7cf3bd73a7c41d8633fb2a92053a55e0e36a4925' hash checked in to the 'master' branch. I have included an example of how to sync an existing checked out repository with the original name to the revised name in the current repository. -- Matt ================================================================================================== ORIGINAL BRANCH NAME NEW BRANCH NAME ================================================================================================== remotes/origin/DOGTAG_10_0_BRANCH ==> remotes/origin/DOGTAG_10_0_BRANCH remotes/origin/IPA_V3_RHEL_7_ERRATA_BRANCH ==> remotes/origin/DOGTAG_10_0_RHEL_BRANCH remotes/origin/DOGTAG_10_1_BRANCH ==> remotes/origin/DOGTAG_10_1_BRANCH remotes/origin/IPA_V4_RHEL_7_1_ERRATA_BRANCH ==> remotes/origin/DOGTAG_10_1_RHEL_BRANCH 'master' 7cf3bd73a7c41d8633fb2a92053a55e0e36a4925==> remotes/origin/DOGTAG_10_2_RHEL_BRANCH remotes/origin/DOGTAG_9_BRANCH ==> remotes/origin/DOGTAG_9_0_BRANCH remotes/origin/IPA_v2_RHEL_6_ERRATA_BRANCH ==>remotes/origin/DOGTAG_9_0_RHEL_BRANCH **remotes/origin/RHEL_7_0_BRANCH ==> remotes/origin/RHEL_7_BRANCH ==> remotes/origin/autoformat ==> remotes/origin/autoformat2 ==> remotes/origin/HEAD -> origin/master ==> remotes/origin/HEAD -> origin/master remotes/origin/master ==> remotes/origin/master ================================================================================================== =========================================================================== EXAMPLE OF UPDATING AN EXISTING BRANCH THAT HAS BEEN PREVIOUSLY CHECKED OUT =========================================================================== (1) Identify the local branch # git branch IPA_V3_RHEL_7_ERRATA_BRANCH (2) Rename the local branch # git branch -m IPA_V3_RHEL_7_ERRATA_BRANCH DOGTAG_10_0_RHEL_BRANCH (3) Identify the local branch # git branch DOGTAG_10_0_RHEL_BRANCH (4) Attempt to update the local branch from the remote branch # git pull . . . Your configuration specifies to merge with the ref 'IPA_V3_RHEL_7_ERRATA_BRANCH' from the remote, but no such ref was fetched. (5) Setup remote upstream tracking on the branch you just renamed # git branch -u origin/DOGTAG_10_0_RHEL_BRANCH Branch DOGTAG_10_0_RHEL_BRANCH set up to track remote branch DOGTAG_10_0_RHEL_BRANCH from origin. (6) Attempt to update the local branch from the remote branch # git pull Already up-to-date. ===========================================================================