Technology sharing

[Git Study Notes] Caput 3 Derivatio, Merging et Configuratio Item Dissertationes (Part 1)

2024-07-12

한어Русский языкEnglishFrançaisIndonesianSanskrit日本語DeutschPortuguêsΕλληνικάespañolItalianoSuomalainenLatina

Caput III Branching, bus et configuratione items

affinis locus:

  • Locus ramus procuratio
  • remotis ramus
  • Vis versionis merge
  • usus git reuse recorded resolution (rerere) Merge pugnantia Git versions
  • Discrimina inter ramos calculare
  • Ramus pupillus (Orphan branches）

3.1 Locus ramus procuratio

si git Bibliotheca localis est, et etiam si opus non est ut codicem remotum communicet, ramus localis tractari potest ut horreum quod remotius communicari debet. Ut in hoc exemplo monstratum est, debes primum aream localem in horreis imitari, quod significat bibliothecam remotam esse.

# clone the jgit repository to match
$ git clone https://git.eclipse.org/r/jgit/jgit 
$ cd jgit 
# Whenever you start working on a bug fix or a new 
# feature in your project, you should create a branch
$ git branch newBugFix 
$ git branch 
* master 
 newBugFix
# The newBugFix branch points to the current HEAD
# to verify this:
$ git log -1 newBugFix --format=format:%H
25fe20b2dbb20cac8aa43c5ad64494ef8ea64ffc
# edit branch description
$ git branch --edit-description newBugFix
# Add description in a newly opened editor
Refactoring the Hydro controller 

The hydro controller code is currently horrible needs to be refactored.  
# Show the description
$ git config --get branch.newBugFix.description 
Refactoring the Hydro controller 

The hydro controller code is currently horrible and needs to be refactored.  
# Show the commit hash the new branch based on
$ cat .git/refs/heads/newBugFix 
25fe20b2dbb20cac8aa43c5ad64494ef8ea64ffc 

  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  • 18
  • 19
  • 20
  • 21
  • 22
  • 23
  • 24
  • 25
  • 26
  • 27

Ex his videri potest ID currentiHEAD of*ID conveniat.

Nota: Post novum ramum creando, huic ramo ad utendum flectendum est;git checkout -b <newBranch>

Expand: Si non sequeris HEAD Novam ramum crea, sed id quidam committas.979e346) , hoc tempore subiectio in hac versione fundata scribi potest:

# new branch from commit ID
$ git branch anotherBugFix 979e346 
$ git log -1 anotherBugFix --format=format:%h 
979e346 
$ git log -1 anotherBugFix --format=format:%H 
979e3467112618cc787e161097986212eaaa4533 
# checkout new branch
$ git checkout -b lastBugFix 979e346

  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8

Visum genere notitia:

  1. git branch: Ramus nomen solum
  2. git branch -v: Annotata et simplicior fundatur 1 SHA-1
  3. git branch -vvPropono remotis nominibus tracking genere secundum II "
$ git branch -v 

  anotherBugFix 979e346 Interactive Rebase: Do actions if  
* lastBugFix    979e346 Interactive Rebase: Do actions if  
  master        25fe20b Add missing package import for jg 
  newBugFix     25fe20b Add missing package import for jg
$ git branch -vv 

  anotherBugFix 979e346 Interactive Rebase: Do actions if e 
* lastBugFix    979e346 Interactive Rebase: Do actions if e 
  master        25fe20b [origin/master] Add missing package  
  newBugFix     25fe20b Add missing package import for g 

  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12

3.2 Longinquus ramus

Aliquando in codice indigena generari potest e clone basis alterius codicis.Hic locus cellarium remotum habet, vulgo appellatumorigin fontem.Ad intelli- Git et eius basim remotam codicem, potes inciperegit status Incipit mandatum;

$ git checkout -b remoteBugFix --track origin/stable-3.2
Switched to a new branch 'remoteBugFix'
Branch 'remoteBugFix' set up to track remote branch 'stable-3.2' from 'origin'.

  • 1
  • 2
  • 3

visibilis;remoteBugFix Remotis tracking rami rami estorigin/stable-3.2 .Hoc temporegit status Eventus loci monstrantHEAD cum remotisHEAD Utrum ramus localis ad remotum ramum celeriter transmittantur. Exempla sunt haec:

# Find a commit on remote branch
$ git log -10 origin/stable-3.2 --oneline
# Checkout specific SHA-1
$ git reset --hard 2e0d178
HEAD is now at 2e0d17885 Add recursive variant of Config.getNames() methods
# Use 'git status' to see the free benefit of Git
$ git status
On branch remoteBugFix
Your branch is behind 'origin/stable-3.2' by 9 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

nothing to commit, working tree clean

  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12

Animadverte:

  1. Hic notio est quae saepe occurrit;fast-forward, significat quod Git merge potest HEAD Movere ad novissimam versionem;
  2. git pull Ad secundum dicendum quod praeceptum est quoddam compositum ex duobus praeceptis;
    1. git fetch
    2. git merge(Merge remotis ad loci ramum tracking)

Judicium superius git status imperio adhibetur ad simulate loci suppliciumgit fetch Post hoc, nova contenta in ramo remoto ad ramum tracking localem evulsum estorigin/stable-3.2 videri. Continuans merge actu synchronise cum ramo locali;

$ git merge origin/stable-3.2
Updating 2e0d17885..f839d383e
Fast-forward
 .../org/eclipse/jgit/api/RebaseCommandTest.java    | 213 +++++++++++++++++----
 .../src/org/eclipse/jgit/api/RebaseCommand.java    |  31 +--
 .../jgit/errors/IllegalTodoFileModification.java   |  59 ++++++
 .../eclipse/jgit/lib/BaseRepositoryBuilder.java    |   2 +-
 .../src/org/eclipse/jgit/lib/Config.java           |   2 +
 .../src/org/eclipse/jgit/lib/RebaseTodoLine.java   |  16 +-
 6 files changed, 266 insertions(+), 57 deletions(-)
 create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/errors/IllegalTodoFileModification.java

  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11

Secundum effectus exsecutionis, videri potest git status Sicut dictum est in promptu, haec merge est ante merge ieiunium (fast-forward merge）

In addition utendo cum creando loci ramus --track Denota semitam ramum remotum;git Est etiam firmamentum ad ramos remotos in ramis exsistentibus specificandis. Si ramum localem in antecessum creas, et ramum remotum coniunge oblivisci;git Hoc nuper pluma venit in manus manus:

# Checkout a new branch without relating to its remote tracking branch
$ git checkout -b remoteBugFix2 2e0d17 
Switched to a new branch 'remoteBugFix2' 
# Set the tracking branch manually by using -u or --set-upstream-to
$ git branch --set-upstream-to origin/stable-3.2 
Branch remoteBugFix2 set up to track remote branch stable-3.2 from origin. 
# Validate current status
$ git status 
On branch remoteBugFix2 
Your branch is behind 'origin/stable-3.2' by 9 commits, and can be fast-forwarded. 
  (use "git pull" to update your local branch) 
nothing to commit, working directory clean 
# Same as the previous demo as expected.
# Update the branch (also a fast-forward merge with origin/stable-3.2)
$ git pull 
Updating 2e0d17885..f839d383e
Fast-forward
 .../org/eclipse/jgit/api/RebaseCommandTest.java    | 213 +++++++++++++++++----
 .../src/org/eclipse/jgit/api/RebaseCommand.java    |  31 +--
 .../jgit/errors/IllegalTodoFileModification.java   |  59 ++++++
 .../eclipse/jgit/lib/BaseRepositoryBuilder.java    |   2 +-
 .../src/org/eclipse/jgit/lib/Config.java           |   2 +
 .../src/org/eclipse/jgit/lib/RebaseTodoLine.java   |  16 +-
 6 files changed, 266 insertions(+), 57 deletions(-)
 create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/errors/IllegalTodoFileModification.java
# The output is still the same as previous one as expected.
# Validate the current HEAD with origin/stable-3.2
$ git log -1 origin/stable-3.2  --format=format:%h
f839d383e
# Still the same.

  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  • 18
  • 19
  • 20
  • 21
  • 22
  • 23
  • 24
  • 25
  • 26
  • 27
  • 28
  • 29
  • 30

3,3 Force generation of merge committit

Priusquam hunc librum legas, multa exempla programmatis traditio catenae et exempla ramosa videri potes; fortasse etiam consilia varia temptaverunt, solum invenire quod semel instrumentum specificum workflui sustinet, difficile est ad eam plene efficiendam application missionibus vis. Git et omnes fere missiones operantium sustinet. Commune opus est ut commissura merge generare possit cum pluma bus (etiamsi novae notae velociter deinceps modo incorporari possunt). Talis postulatio saepe indicatur certam plumam inmersam esse, et vis hanc operationem expresse in horreis condi.

Apicibus

cum Git Omnes informationes submissionis aditum praebet opportunum et celeriter;Git Bibliotheca actu utendum estlog, non fons code tergum。

Hoc exemplum generabit coactus verbam committere;

# Checkout branch stable-3.1 as remoteOldBugFix for use
$ git checkout -b remoteOldBugFix --track origin/stable-3.1
# force a merge commit
$ git merge origin/stable-3.2 --no-ff --edit --quiet

  • 1
  • 2
  • 3
  • 4

Nota, utere --edit Post parametri occasum, mutare potes defectionem merge informationes commentarias in editore aperientis.in exemplum--no-ff Indicat deinceps modus inactivare ieiunium;--quiet Ad simpliciorem reddere contentus screen output. Effectus finalis ostenditur in figura;

Figura 3-1

Ad comparationem cum via normali, dele cum merge faciendo --no-ff Parameter items:

# Reset to initial status
$ git reset --hard  remotes/origin/stable-3.1
# Merge with fast forward by default
$ git merge origin/stable-3.2 --quiet

  • 1
  • 2
  • 3
  • 4

Effectus talis est:

Figura 3-2

Merge contentus medium

Praeter merge completam faciendo, Git etiam permittit utentes intervenire in contentis immersis et libere decernendi quid contentum in merge includatur.usus--no-commit modulus;git Processum interrumpere antequam merge committat, utens reprimat vel addat lima antequam finales committat. Exempli gratia, numerus versionis exertus modificatur in pluma ramus propositi, sed ramus principalis non modificatur. Defalta merge operandi numerum versionis ad numerum versionis in plumis ramo renovabit, sed non actu vis numerum versionis mutare.Utere hoc tempore--no-commit evitari potest.

Hoc exemplum ostendit operationem merge cum interventu usoris. Cum bus, vis manually excludere committere quod licentia fasciculi renovavit:

# Clone repo into demo
$ git clone https://github.com/PacktPublishing/Git-Version-Control-Cookbook-Second-Edition_hello_world_flow_model.git demo
$ cd demo
# Checkout remote branch
$ git checkout -b remotePartlyMerge --track origin/release/1.0
Branch remotePartlyMerge set up to track remote branch release/1.0 from origin. 
Switched to a new branch 'remotePartlyMerge'
# Force a merge commit with --no-commit flag
$ git merge origin/master  --no-ff --no-commit
Automatic merge went well; stopped before committing as requested
# Exclude LICENSE file
$ git reset LICENSE
# Resume merging
$ git commit -m "Merging without LICENSE"
[remotePartlyMerge 1202b0e] Merging without LICENSE
# Check status (only LICENSE file remain untracked)
$ git status
On branch remotePartlyMerge
Your branch is ahead of 'origin/release/1.0' by 6 commits.
  (use "git push" to publish your local commits)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        LICENSE

nothing added to commit but untracked files present (use "git add" to track)
# check difference excluding LICENSE file (only on Linux)
$ git diff origin/master !(LICENSE)

  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  • 18
  • 19
  • 20
  • 21
  • 22
  • 23
  • 24
  • 25
  • 26
  • 27
  • 28

Considerans quaestionem de celeritate retis, repositio specimen fuit Git-Version-Control-Cookbook-Second-Edition_hello_world_flow_model.git Adde huic bibliothecae studiorum (repos/ex3.3-no-commit-repo.rar ）

Personal profile

technologiae technologiae plus quam 30 annos operam dedit et in variis linguis proficit ut java, linux, javascript, php, css, etc. Multas contributiones in aperto fonte campo fecit elit documentorum statione ad communicandas quaestiones in technologia progressus ad futuram referentiam

mihi contactus notitia

Mail