| Neels Hofmeyr | 45f3cec | 2017-08-13 03:25:38 +0200 | [diff] [blame^] | 1 | This dir is intended to keep all the git clones. |
| 2 | |
| 3 | There are some handy scripts I use for my daily Osmocom development: |
| 4 | |
| 5 | ./g run a git command in each source tree |
| 6 | ./e run an arbitrary shell command in each source tree |
| 7 | ./st show a brief branch and local mods status for each source tree |
| 8 | ./s walk through each source tree and use gitk as well as user interaction |
| 9 | to quickly fast-forward / reset changes coming in from upstream. (This |
| 10 | is potentially dangerous, but safe if you only hit enter every time.) |
| 11 | |
| 12 | Examples: |
| 13 | |
| 14 | ----------------------------------------------------------------------------- |
| 15 | |
| 16 | ./g fetch # run 'git fetch' in each clone = fetch all from upstream |
| 17 | |
| 18 | ===== libasn1c ===== |
| 19 | remote: Counting objects: 29, done |
| 20 | remote: Finding sources: 100% (26/26) |
| 21 | remote: Total 26 (delta 8), reused 22 (delta 8) |
| 22 | Unpacking objects: 100% (26/26), done. |
| 23 | From ssh://go/libasn1c |
| 24 | 4151e59..aaae8c7 master -> origin/master |
| 25 | |
| 26 | ===== libosmo-abis ===== |
| 27 | |
| 28 | ===== libosmo-netif ===== |
| 29 | remote: Counting objects: 105, done |
| 30 | remote: Finding sources: 100% (92/92) |
| 31 | remote: Total 92 (delta 54), reused 92 (delta 54) |
| 32 | Unpacking objects: 100% (92/92), done. |
| 33 | From ssh://go/libosmo-netif |
| 34 | 6032a35..e786055 master -> origin/master |
| 35 | + 058d3b7...89180ef pespin/jitterbuffer -> origin/pespin/jitterbuffer (forced update) |
| 36 | * [new branch] pespin/osmux-lostpkt -> origin/pespin/osmux-lostpkt |
| 37 | |
| 38 | ===== libosmo-sccp ===== |
| 39 | |
| 40 | ===== libosmocore ===== |
| 41 | remote: Counting objects: 36, done |
| 42 | remote: Finding sources: 100% (24/24) |
| 43 | remote: Total 24 (delta 18), reused 24 (delta 18) |
| 44 | Unpacking objects: 100% (24/24), done. |
| 45 | From ssh://go/libosmocore |
| 46 | 4a29f34..733810c master -> origin/master |
| 47 | |
| 48 | [...] |
| 49 | |
| 50 | ----------------------------------------------------------------------------- |
| 51 | |
| 52 | ./st # any modifications / updates? (e.g. useful after './g fetch') |
| 53 | # (checks only 'master' and the current checked-out branch) |
| 54 | |
| 55 | libasn1c master |
| 56 | libosmo-abis master |
| 57 | libosmo-netif master |
| 58 | libosmo-sccp MODS master[+1|-10] |
| 59 | libosmocore master |
| 60 | libsmpp34 master |
| 61 | openggsn master |
| 62 | osmo-bsc pre_release[+43|-43] |
| 63 | osmo-hlr master |
| 64 | osmo-iuh pre_release[+1] |
| 65 | osmo-mgw pre_release |
| 66 | osmo-msc pre_release |
| 67 | osmo-sgsn pre_release |
| 68 | |
| 69 | # This shows me that I have local mods in libosmo-sccp, while my local master |
| 70 | # branch has one commit that isn't on upstream ("+1"); but at the same time |
| 71 | # origin/master has moved on by 10 commits ("-10"). |
| 72 | # My osmo-bsc git is on branch 'pre_release', and apparently I have amended the |
| 73 | # 44th commit before pre_release's HEAD. |
| 74 | # And on osmo-iuh, I have one un-pushed local commit. |
| 75 | |
| 76 | ----------------------------------------------------------------------------- |
| 77 | |
| 78 | ./e rm .version # in each source tree, remove the local .version file |
| 79 | |
| 80 | ----------------------------------------------------------------------------- |
| 81 | |
| 82 | ./s # interactively try to fast-forward to upstream and/or save |
| 83 | # local modifications. |
| 84 | # If you just hit Enter all the time, nothing will be changed. |
| 85 | |
| 86 | |
| 87 | libosmocore |
| 88 | master |
| 89 | Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. |
| 90 | Behind. git merge? (empty = no, 'ok' = yes) |
| 91 | ok # <-- type 'ok' and hit enter |
| 92 | git merge |
| 93 | Updating ff932bb..4a29f34 |
| 94 | Fast-forward |
| 95 | include/osmocom/gprs/gprs_rlc.h | 25 +++++++++++++++++++ |
| 96 | include/osmocom/gsm/tlv.h | 21 +++++++++++++++- |
| 97 | src/gsm/gprs_rlc.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 98 | src/gsm/libosmogsm.map | 6 +++++ |
| 99 | 4 files changed, 141 insertions(+), 1 deletion(-) |
| 100 | |
| 101 | |
| 102 | libosmo-netif |
| 103 | master |
| 104 | Your branch is up-to-date with 'origin/master'. |
| 105 | |
| 106 | |
| 107 | libosmo-sccp |
| 108 | master |
| 109 | Your branch and 'origin/master' have diverged, |
| 110 | Diverged. git reset --hard origin/master ? (empty = no, 'ok' = yes) |
| 111 | # a 'gitk' opens; just hit 'enter' to keep local diverged commits. |
| 112 | # If you type 'ok', local mods are saved to a wip branch first. |
| 113 | |
| 114 | Local mods |
| 115 | modified: src/osmo_ss7_vty.c |
| 116 | |
| 117 | commit to new branch? (enter name, empty = no) |
| 118 | |
| 119 | commit to this branch master ? (empty = no, 'ok' = yes) |
| 120 | |
| 121 | [...] |
| 122 | |
| 123 | ----------------------------------------------------------------------------- |
| 124 | |
| 125 | |
| 126 | Enjoy, |
| 127 | |
| 128 | ~Neels |
| 129 | <nhofmeyr@sysmocom.de> |