Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git subrepo pull (merge) postfixbuddy #29

Merged
merged 2 commits into from
Aug 5, 2020

Conversation

LukeShirnia
Copy link
Collaborator

@LukeShirnia LukeShirnia commented Aug 5, 2020

subrepo:
  subdir:   "postfixbuddy"
  merged:   "387c4f4"
upstream:
  origin:   "https://github.com/dsgnr/postfixbuddy.git"
  branch:   "master"
  commit:   "723ae6b"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
$ ./audit.sh --update postfixbuddy

------------------------------------------
Verifying recorded commit...

Commit on file: 0227dde49ec1e27fc39a2c4ba008a6f9bb980675
https://raw.githubusercontent.com/rackerlabs/useful-scripts/master/postfixbuddy/.gitrepo

Remote Repo Info (commit)
https://raw.githubusercontent.com/dsgnr/postfixbuddy/0227dde49ec1e27fc39a2c4ba008a6f9bb980675/postfixbuddy.py
sha1sum: 77832615cf97f2a70b0165bdad6622a72252a252

SubRepo (remote) Info (master)
https://raw.githubusercontent.com/rackerlabs/useful-scripts/master/postfixbuddy/postfixbuddy.py
sha1sum: 77832615cf97f2a70b0165bdad6622a72252a252

Verifying commit: sha1sums match!
master (remote branch) is inline with specified commit hash
------------------------------------------

------------------------------------------
Checking if updates available... (script/commit vs script/master)

Remote 'Commit' URL
https://raw.githubusercontent.com/dsgnr/postfixbuddy/0227dde49ec1e27fc39a2c4ba008a6f9bb980675/postfixbuddy.py
sha1sum: 77832615cf97f2a70b0165bdad6622a72252a252

Remote 'Master' URL
https://raw.githubusercontent.com/dsgnr/postfixbuddy/master/postfixbuddy.py
sha1sum: 34129201e375306533cb9a3a05c8a06fdfcc81ed

Master and commit hash do NOT match
Updates: Possible updates available

Compare URL:
https://github.com/dsgnr/postfixbuddy/compare/0227dde49ec1e27fc39a2c4ba008a6f9bb980675...master

------------------------------------------


Error: You appear to be working on the master branch!
Updating/adding should be added to a sub branch.

Would you like to autocreate a new branch (postfixbuddy-update-2020-08-05)? (y|n) y
Branch Updated.....
Verifying Update.....
Cleaning up....
Deleted branch subrepo/postfixbuddy (was 387c4f4).

------------------------------------------
Verifying recorded commit...

Commit on file: 723ae6b249f320773dcb12ed054a7b4ce7670196
/home/lukeshirnia/development/github/git_rackspace/useful-scripts/postfixbuddy/.gitrepo

Remote Repo Info (commit)
https://raw.githubusercontent.com/dsgnr/postfixbuddy/723ae6b249f320773dcb12ed054a7b4ce7670196/postfixbuddy.py
sha1sum: 34129201e375306533cb9a3a05c8a06fdfcc81ed

SubRepo (local) Info (postfixbuddy-update-2020-08-05)
/home/lukeshirnia/development/github/git_rackspace/useful-scripts/postfixbuddy/postfixbuddy.py
sha1sum: 34129201e375306533cb9a3a05c8a06fdfcc81ed

Verifying commit: sha1sums match!
postfixbuddy-update-2020-08-05 (local branch) is inline with specified commit hash
------------------------------------------

subrepo:
  subdir:   "postfixbuddy"
  merged:   "387c4f4"
upstream:
  origin:   "https://github.com/dsgnr/postfixbuddy.git"
  branch:   "master"
  commit:   "723ae6b"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
@LukeShirnia LukeShirnia requested a review from dsgnr as a code owner August 5, 2020 10:01
@LukeHandle
Copy link
Contributor

$ ./audit.sh --verify postfixbuddy

------------------------------------------
Verifying recorded commit...

Commit on file: 723ae6b249f320773dcb12ed054a7b4ce7670196
https://raw.githubusercontent.com/rackerlabs/useful-scripts/postfixbuddy-update-2020-08-05/postfixbuddy/.gitrepo

\e[4mRemote Repo Info (commit)\e[24m
https://raw.githubusercontent.com/dsgnr/postfixbuddy/723ae6b249f320773dcb12ed054a7b4ce7670196/postfixbuddy.py
sha1sum: 34129201e375306533cb9a3a05c8a06fdfcc81ed

\e[4mSubRepo (remote) Info (postfixbuddy-update-2020-08-05)\e[24m
https://raw.githubusercontent.com/rackerlabs/useful-scripts/postfixbuddy-update-2020-08-05/postfixbuddy/postfixbuddy.py
sha1sum: 34129201e375306533cb9a3a05c8a06fdfcc81ed

Verifying commit: sha1sums match!
postfixbuddy-update-2020-08-05 (remote branch) is inline with specified commit hash
------------------------------------------

@LukeHandle LukeHandle merged commit e44c603 into master Aug 5, 2020
@LukeShirnia LukeShirnia deleted the postfixbuddy-update-2020-08-05 branch August 5, 2020 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants