Skip to content

Conversation

@LukeShirnia
Copy link
Collaborator

Fixes -v issue created in previous PR

subrepo:
  subdir:   "getusers"
  merged:   "69aedae"
upstream:
  origin:   "https://github.com/LukeJReid/getusers.git"
  branch:   "master"
  commit:   "69aedae"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
[lukeshirnia@rax useful-scripts]$ ./audit.sh --update getusers/

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

Commit on file: d0b41a6da27392fbf62d4c0e196fbf820c6c9d74
https://raw.githubusercontent.com/rackerlabs/useful-scripts/master/getusers/.gitrepo

Remote Repo Info (commit)
https://raw.githubusercontent.com/LukeJReid/getusers/d0b41a6da27392fbf62d4c0e196fbf820c6c9d74/getusers.py
sha1sum: d625da384a31a0be5270a6585ef8ae65a8141a62

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

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/LukeJReid/getusers/d0b41a6da27392fbf62d4c0e196fbf820c6c9d74/getusers.py
sha1sum: d625da384a31a0be5270a6585ef8ae65a8141a62

Remote 'Master' URL
https://raw.githubusercontent.com/LukeJReid/getusers/master/getusers.py
sha1sum: 2a27db274b5141e0bf9376dfe2f868987d0dcd6c

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

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

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

Commit on file: 69aedaec32ec53ae5341aeda5d62ac9afa2ad004
/home/lukeshirnia/development/github/git_rackspace/useful-scripts/getusers/.gitrepo

Remote Repo Info (commit)
https://raw.githubusercontent.com/LukeJReid/getusers/69aedaec32ec53ae5341aeda5d62ac9afa2ad004/getusers.py
sha1sum: 2a27db274b5141e0bf9376dfe2f868987d0dcd6c

SubRepo (local) Info (getusers-update-2020-03-19)
/home/lukeshirnia/development/github/git_rackspace/useful-scripts/getusers/getusers.py
sha1sum: 2a27db274b5141e0bf9376dfe2f868987d0dcd6c

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

subrepo:
  subdir:   "getusers"
  merged:   "69aedae"
upstream:
  origin:   "https://github.com/LukeJReid/getusers.git"
  branch:   "master"
  commit:   "69aedae"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
@LukeShirnia LukeShirnia force-pushed the getusers-update-2020-03-19 branch from 33ce71d to dc2e0bc Compare March 19, 2020 07:51
@LukeHandle
Copy link
Contributor

$ git checkout getusers-update-2020-03-19
$ ./audit.sh --verify getusers

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

Commit on file: 69aedaec32ec53ae5341aeda5d62ac9afa2ad004
https://raw.githubusercontent.com/rackerlabs/useful-scripts/getusers-update-2020-03-19/getusers/.gitrepo

\e[4mRemote Repo Info (commit)\e[24m
https://raw.githubusercontent.com/LukeJReid/getusers/69aedaec32ec53ae5341aeda5d62ac9afa2ad004/getusers.py
sha1sum: 2a27db274b5141e0bf9376dfe2f868987d0dcd6c

\e[4mSubRepo (remote) Info (getusers-update-2020-03-19)\e[24m
https://raw.githubusercontent.com/rackerlabs/useful-scripts/getusers-update-2020-03-19/getusers/getusers.py
sha1sum: 2a27db274b5141e0bf9376dfe2f868987d0dcd6c

Verifying commit: sha1sums match!
getusers-update-2020-03-19 (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.

LGTM. Verified

@LukeHandle LukeHandle merged commit 95cf28c into master Mar 19, 2020
@LukeHandle LukeHandle deleted the getusers-update-2020-03-19 branch March 19, 2020 15:30
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.

3 participants