Post

37 The Pull Merge Push Workflow

Posted
By EthanWang
6 min read
37 The Pull Merge Push Workflow

Command

1

$ vim all_checks.py

Modify code

Modify the parameter to min_gb

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

#!/usr/binenv python3
(...)
def check_disk_full(disk, min_gb, min_percent):
    """Returns True if there isn't enough disk space, False otherwise."""
    du = shutil.disk_usage(disk)
    # Calculate the percentage of free space
    percent_free = 100 * du.free / du.total
    # Calculate how many free gigabytes
    gigabytes_free = du.free / 2**30
    if percent_free < min_percent or gigabytes_free < min_gb:
        return True
    return False

def main(): 
    if check_reboot():
        print("Pending Reboot.")
        sys_exit(1)
    if check_disk_full(disk="/", min_gb=2, min_percent=10):
        print("Disk full.")
        sys.exit(1)
    
    print("Everything ok")
    sys.exit(0)

main()

Command

1

$ git add -p

Code output

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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63

diff --git a/all_checks.py b/all_checks.py

index e46cdae..a40047c 100755

--- a/all_checks.py

+++ b/all_checks.py

@@ -8,14 +8,14 @@ def check_reboot():

     """Returns True if the computer has a pending reboot."""

     return os.path.exists("/run/reboot-required")

 

-def check_disk_full(disk, min_absolute, min_percent):

+def check_disk_full(disk, min_gb, min_percent):

     """Returns True if there isn't enough disk space, False otherwise."""

     du = shutil.disk_usage(disk)

     # Calculate the percentage of free space

     percent_free = 100 * du.free / du.total

     # Calculate how many free gigabytes

     gigabytes_free = du.free / 2**30

-    if percent_free < min_percent or gigabytes_free < min_absolute:

+    if percent_free < min_percent or gigabytes_free < min_gb:

         return True

     return False

 

Stage this hunk [y,n,q,a,d,j,J,g,/,s,e,?]? y

@@ -27,7 +27,7 @@ def main():

     if check_reboot():

         print("Pending Reboot.")

         sys.exit(1)

-    if check_disk_full("/", 2, 10):

+    if check_disk_full(disk="/", min_gb=2, min_percent=10):

         print("Disk full.")

         sys.exit(1)

 

Stage this hunk [y,n,q,a,d,K,g,/,e,?]? y

Command

1

$ git commit -m 'Rename min_absolute to min_gb, use parameter names'

Code output

1
2
3

[master 03923d0] Rename min_absolute to min_gb, use parameter names

 1 file changed, 3 insertions(+), 3 deletions(-)

Command

1

$ git push

Code output

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

Username for 'https://github.com': artwalker

Password for 'https://artwalker@github.com': 

To https://github.com/artwalker/health-checks.git

 ! [rejected]        master -> master (fetch first)

error: failed to push some refs to 'https://github.com/artwalker/health-checks.git'

hint: Updates were rejected because the remote contains work that you do

hint: not have locally. This is usually caused by another repository pushing

hint: to the same ref. You may want to first integrate the remote changes

hint: (e.g., 'git pull ...') before pushing again.

hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Command

1

$ git pull

Code output

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

remote: Enumerating objects: 5, done.

remote: Counting objects: 100% (5/5), done.

remote: Compressing objects: 100% (2/2), done.

remote: Total 3 (delta 1), reused 3 (delta 1), pack-reused 0

Unpacking objects: 100% (3/3), done.

From https://github.com/red-quinoa/health-checks

   92d659..a2dc118  master     -> origin/master

Auto-merging all_checks.py

CONFLICT (content): Merge conflict in all_checks.py

Automatic merge failed; fix conflicts and then commit the result.

Command

1

$ git log --graph --oneline --all

Code output

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

* 03d23d0 Rename min_absolute to min_gb, use parameter names

| * 42dc118 (origin/master, origin/HEAD) reorder conditional to match parameter order

|/  

| * 4d99c56 (origin/experimental, experimental) Empty check_load function

|/  

* 922d659 Add disk full check to all_checks.py

* b62dc2e Add initial files for the checks

* 807cb50 Add one more line to README.md

* 3d9f86c Initial commit

Command

1

$ git log -p origin/master

Code output

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
31
32
33
34
35
36
37
38
39
40
41

commit a2dc1181e5cccf36fec30d6eeefbe569a13883de (origin/master, origin/HEAD)

Author: Blue Kale <bluekale@example.com>

Date:   Mon Jan 6 14:52:23 2020 -0800

    Reorder conditional to match parameter order

diff --git a/all_checks.py b/all_checks.py

index e46cdae..6dda356 100755

--- a/all_checks.py

+++ b/all_checks.py

@@ -15,7 +15,7 @@ def check_disk_full(disk, min_absolute, min_percent):

     percent_free = 100 * du.free / du.total

     # Calculate how many free gigabytes

     gigabytes_free = du.free / 2**30

-    if percent_free < min_percent or gigabytes_free < min_absolute:

+    if gigabytes_free < min_absolute or percent_free < min_percent:

         return True

     return False

commit 922d65950b5325109525a24b71d8df8a46412d04 (HEAD -> master, origin/master, origin/HEAD)

Author: Blue Kale <bluekale@example.com>

Date:   Mon Jan 6 14:42:44 2020 -0800

    Add disk full check to all_checks.py

diff –git a/all_checks.py b/all_checks.py

Command

1

$ vim all_checks.py

Modify code

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

#!/usr/binenv python3
(...)
def check_disk_full(disk, min_gb, min_percent):
    """Returns True if there isn't enough disk space, False otherwise."""
    du = shutil.disk_usage(disk)
    # Calculate the percentage of free space
    percent_free = 100 * du.free / du.total
    # Calculate how many free gigabytes
    gigabytes_free = du.free / 2**30
<<<<<<< HEAD
    if percent_free < min_percent or gigabytes_free < min_gb:
=======
    if gigabytes_free < min_absolute or percent_free < min_percent:
>>>>>>> a2dc1181e5cccf36fec30d6eeefbe569a13883de
        return True
    return False
(...)

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

(...)
def check_disk_full(disk, min_gb, min_percent):
    """Returns True if there isn't enough disk space, False otherwise."""
    du = shutil.disk_usage(disk)
    # Calculate the percentage of free space
    percent_free = 100 * du.free / du.total
    # Calculate how many free gigabytes
    gigabytes_free = du.free / 2**30
    if gigabytes_free < min_gb or percent_free < min_percent:
        return True
    return False

(...)

Command

1
2

$ git add all_checks.py 
$ git commit

Modify file

1
2
3
4
5
6
7
8
9
10
11

Merge branch 'master' of https://github.com/artwalker/health-checks

Fixed check_disk_usage conditional to use the new order and new variable name.

# Conflicts:

#       all_checks.py

#

(...)

Command

1

$ git push

Code output

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

Enumerating objects: 10, done.

Counting objects: 100% (10/10), done.

Delta compression using up to 2 threads

Compressing objects: 100% (6/6), done.

Writing objects: 100% (6/6), 877 bytes | 877.00 KiB/s, done.

Total 6 (delta 2), reused 0 (delta 0)

remote: Resolving deltas: 100% (2/2), completed with 1 local object.

To https://github.com/redquinoa/health-checks.git

   a2dc118..58351ff  master -> master

Command

1

$ git log --graph --oneline

Code output

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21

* 58351ff (Head -> master, origin/master, origin/HEAD) Merge branch ‘master’ of https://github.com/redquinoa/health-checks.git

|\

| * 42dc118 (origin/master, origin/HEAD) reorder conditional to match parameter order

* | 03d23d0 Rename min_absolute to min_gb, use parameter names

|/  

| * 4d99c56 (origin/experimental, experimental) Empty check_load function

|/  

* 922d659 Add disk full check to all_checks.py

* b62dc2e Add initial files for the checks

* 807cb50 Add one more line to README.md

* 3d9f86c Initial commit
Git&&GitHub
git github
This post is licensed under CC BY 4.0 by the author.