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 apache2buddy #23

Merged
merged 1 commit into from
Mar 27, 2020
Merged

Conversation

LukeShirnia
Copy link
Collaborator

subrepo:
  subdir:   "apache2buddy"
  merged:   "fbc7eb2"
upstream:
  origin:   "https://github.com/richardforth/apache2buddy.git"
  branch:   "staging"
  commit:   "fbc7eb2"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
lukeshirnia@rax useful-scripts]$ ./audit.sh --update apache2buddy/

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

Commit on file: 9672bbc56f257e59aba4a51f2e903645d7ca30a2
https://raw.githubusercontent.com/rackerlabs/useful-scripts/master/apache2buddy/.gitrepo

Remote Repo Info (commit)
https://raw.githubusercontent.com/richardforth/apache2buddy/9672bbc56f257e59aba4a51f2e903645d7ca30a2/apache2buddy.pl
sha1sum: dabbe420102d2a262266959a574e38623c80f3d8

SubRepo (remote) Info (master)
https://raw.githubusercontent.com/rackerlabs/useful-scripts/master/apache2buddy/apache2buddy.pl
sha1sum: dabbe420102d2a262266959a574e38623c80f3d8

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/richardforth/apache2buddy/9672bbc56f257e59aba4a51f2e903645d7ca30a2/apache2buddy.pl
sha1sum: dabbe420102d2a262266959a574e38623c80f3d8

Remote 'Master' URL
https://raw.githubusercontent.com/richardforth/apache2buddy/master/apache2buddy.pl
sha1sum: 18ed43c1f20ab374e6e314aad44b6b6b4faed6d3

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

Compare URL:
https://github.com/richardforth/apache2buddy/compare/9672bbc56f257e59aba4a51f2e903645d7ca30a2...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 (apache2buddy-update-2020-03-27)? (y|n) y
Branch Updated.....
Verifying Update.....
Cleaning up....
error: branch 'subrepo/apache2buddy/' not found.

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

Commit on file: fbc7eb268c75b5c0abc94b9e4e1fe2edb420e376
/home/lukeshirnia/development/github/git_rackspace/useful-scripts/apache2buddy/.gitrepo

Remote Repo Info (commit)
https://raw.githubusercontent.com/richardforth/apache2buddy/fbc7eb268c75b5c0abc94b9e4e1fe2edb420e376/apache2buddy.pl
sha1sum: 18ed43c1f20ab374e6e314aad44b6b6b4faed6d3

SubRepo (local) Info (apache2buddy-update-2020-03-27)
/home/lukeshirnia/development/github/git_rackspace/useful-scripts/apache2buddy/apache2buddy.pl
sha1sum: 18ed43c1f20ab374e6e314aad44b6b6b4faed6d3

Verifying commit: sha1sums match!
apache2buddy-update-2020-03-27 (local branch) is inline with specified commit hash
------------------------------------------

subrepo:
  subdir:   "apache2buddy"
  merged:   "fbc7eb2"
upstream:
  origin:   "https://github.com/richardforth/apache2buddy.git"
  branch:   "staging"
  commit:   "fbc7eb2"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
@LukeHandle
Copy link
Contributor

LGTM


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

Commit on file: fbc7eb268c75b5c0abc94b9e4e1fe2edb420e376
https://raw.githubusercontent.com/rackerlabs/useful-scripts/apache2buddy-update-2020-03-27/apache2buddy/.gitrepo

\e[4mRemote Repo Info (commit)\e[24m
https://raw.githubusercontent.com/richardforth/apache2buddy/fbc7eb268c75b5c0abc94b9e4e1fe2edb420e376/apache2buddy.pl
sha1sum: 18ed43c1f20ab374e6e314aad44b6b6b4faed6d3

\e[4mSubRepo (remote) Info (apache2buddy-update-2020-03-27)\e[24m
https://raw.githubusercontent.com/rackerlabs/useful-scripts/apache2buddy-update-2020-03-27/apache2buddy/apache2buddy.pl
sha1sum: 18ed43c1f20ab374e6e314aad44b6b6b4faed6d3

Verifying commit: sha1sums match!
apache2buddy-update-2020-03-27 (remote branch) is inline with specified commit hash
------------------------------------------```

Copy link
Contributor

@LukeHandle LukeHandle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@LukeShirnia LukeShirnia merged commit 6906481 into master Mar 27, 2020
@LukeShirnia LukeShirnia deleted the apache2buddy-update-2020-03-27 branch March 27, 2020 17:08
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