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 #28

Merged
merged 1 commit into from
Aug 5, 2020

Conversation

LukeShirnia
Copy link
Collaborator

subrepo:
  subdir:   "postfixbuddy"
  merged:   "9668b13"
upstream:
  origin:   "https://github.com/dsgnr/postfixbuddy.git"
  branch:   "master"
  commit:   "0227dde"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
------------------------------------------
Verifying recorded commit...

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

Remote Repo Info (commit)
https://raw.githubusercontent.com/dsgnr/postfixbuddy/2dfbeebe413fce6b4e5cc65f0e8c16e7c7499ebc/postfixbuddy.py
sha1sum: a5f7b6c563d5596a4ea1428c0e573c3a998544fe

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

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/2dfbeebe413fce6b4e5cc65f0e8c16e7c7499ebc/postfixbuddy.py
sha1sum: a5f7b6c563d5596a4ea1428c0e573c3a998544fe

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

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

Compare URL:
https://github.com/dsgnr/postfixbuddy/compare/2dfbeebe413fce6b4e5cc65f0e8c16e7c7499ebc...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....
error: branch 'subrepo/postfixbuddy/' not found.

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

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

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

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

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

subrepo:
  subdir:   "postfixbuddy"
  merged:   "9668b13"
upstream:
  origin:   "https://github.com/dsgnr/postfixbuddy.git"
  branch:   "master"
  commit:   "0227dde"
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 09:22
@dsgnr dsgnr merged commit 510c7f9 into master Aug 5, 2020
@dsgnr dsgnr deleted the postfixbuddy-update-2020-08-05 branch August 5, 2020 09:25
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