{"action":"opened","number":19,"pull_request":{"url":"https://api.github.com/repos/Strider-CD/strider-git/pulls/19","id":28006327,"html_url":"https://github.com/Strider-CD/strider-git/pull/19","diff_url":"https://github.com/Strider-CD/strider-git/pull/19.diff","patch_url":"https://github.com/Strider-CD/strider-git/pull/19.patch","issue_url":"https://api.github.com/repos/Strider-CD/strider-git/issues/19","number":19,"state":"open","locked":false,"title":"fetch-then-reset rather than reset-then-destructive-pull [Fixes Strider-CD/strider#701]","user":{"login":"doublerebel","id":212827,"avatar_url":"https://avatars.githubusercontent.com/u/212827?v=3","gravatar_id":"","url":"https://api.github.com/users/doublerebel","html_url":"https://github.com/doublerebel","followers_url":"https://api.github.com/users/doublerebel/followers","following_url":"https://api.github.com/users/doublerebel/following{/other_user}","gists_url":"https://api.github.com/users/doublerebel/gists{/gist_id}","starred_url":"https://api.github.com/users/doublerebel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/doublerebel/subscriptions","organizations_url":"https://api.github.com/users/doublerebel/orgs","repos_url":"https://api.github.com/users/doublerebel/repos","events_url":"https://api.github.com/users/doublerebel/events{/privacy}","received_events_url":"https://api.github.com/users/doublerebel/received_events","type":"User","site_admin":false},"body":"`git pull` will try to merge a branch with diverging history.  Therefore, cached git repo + force push = `git pull` tries to merge the old and new branches.  Instead I propose fetching the updates, then resetting to the latest commit of the current branch.\r\n\r\nAlso `var get = pull` in line 127 appears to be unused, so I removed it.","created_at":"2015-01-26T05:09:24Z","updated_at":"2015-01-26T05:09:24Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/Strider-CD/strider-git/pulls/19/commits","review_comments_url":"https://api.github.com/repos/Strider-CD/strider-git/pulls/19/comments","review_comment_url":"https://api.github.com/repos/Strider-CD/strider-git/pulls/comments/{number}","comments_url":"https://api.github.com/repos/Strider-CD/strider-git/issues/19/comments","statuses_url":"https://api.github.com/repos/Strider-CD/strider-git/statuses/68c1e88cd42c8e4b9746f49130b1fbe9890cd75d","head":{"label":"doublerebel:master","ref":"master","sha":"68c1e88cd42c8e4b9746f49130b1fbe9890cd75d","user":{"login":"doublerebel","id":212827,"avatar_url":"https://avatars.githubusercontent.com/u/212827?v=3","gravatar_id":"","url":"https://api.github.com/users/doublerebel","html_url":"https://github.com/doublerebel","followers_url":"https://api.github.com/users/doublerebel/followers","following_url":"https://api.github.com/users/doublerebel/following{/other_user}","gists_url":"https://api.github.com/users/doublerebel/gists{/gist_id}","starred_url":"https://api.github.com/users/doublerebel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/doublerebel/subscriptions","organizations_url":"https://api.github.com/users/doublerebel/orgs","repos_url":"https://api.github.com/users/doublerebel/repos","events_url":"https://api.github.com/users/doublerebel/events{/privacy}","received_events_url":"https://api.github.com/users/doublerebel/received_events","type":"User","site_admin":false},"repo":{"id":29845547,"name":"strider-git","full_name":"doublerebel/strider-git","owner":{"login":"doublerebel","id":212827,"avatar_url":"https://avatars.githubusercontent.com/u/212827?v=3","gravatar_id":"","url":"https://api.github.com/users/doublerebel","html_url":"https://github.com/doublerebel","followers_url":"https://api.github.com/users/doublerebel/followers","following_url":"https://api.github.com/users/doublerebel/following{/other_user}","gists_url":"https://api.github.com/users/doublerebel/gists{/gist_id}","starred_url":"https://api.github.com/users/doublerebel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/doublerebel/subscriptions","organizations_url":"https://api.github.com/users/doublerebel/orgs","repos_url":"https://api.github.com/users/doublerebel/repos","events_url":"https://api.github.com/users/doublerebel/events{/privacy}","received_events_url":"https://api.github.com/users/doublerebel/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/doublerebel/strider-git","description":"Basic git provider","fork":true,"url":"https://api.github.com/repos/doublerebel/strider-git","forks_url":"https://api.github.com/repos/doublerebel/strider-git/forks","keys_url":"https://api.github.com/repos/doublerebel/strider-git/keys{/key_id}","collaborators_url":"https://api.github.com/repos/doublerebel/strider-git/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/doublerebel/strider-git/teams","hooks_url":"https://api.github.com/repos/doublerebel/strider-git/hooks","issue_events_url":"https://api.github.com/repos/doublerebel/strider-git/issues/events{/number}","events_url":"https://api.github.com/repos/doublerebel/strider-git/events","assignees_url":"https://api.github.com/repos/doublerebel/strider-git/assignees{/user}","branches_url":"https://api.github.com/repos/doublerebel/strider-git/branches{/branch}","tags_url":"https://api.github.com/repos/doublerebel/strider-git/tags","blobs_url":"https://api.github.com/repos/doublerebel/strider-git/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/doublerebel/strider-git/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/doublerebel/strider-git/git/refs{/sha}","trees_url":"https://api.github.com/repos/doublerebel/strider-git/git/trees{/sha}","statuses_url":"https://api.github.com/repos/doublerebel/strider-git/statuses/{sha}","languages_url":"https://api.github.com/repos/doublerebel/strider-git/languages","stargazers_url":"https://api.github.com/repos/doublerebel/strider-git/stargazers","contributors_url":"https://api.github.com/repos/doublerebel/strider-git/contributors","subscribers_url":"https://api.github.com/repos/doublerebel/strider-git/subscribers","subscription_url":"https://api.github.com/repos/doublerebel/strider-git/subscription","commits_url":"https://api.github.com/repos/doublerebel/strider-git/commits{/sha}","git_commits_url":"https://api.github.com/repos/doublerebel/strider-git/git/commits{/sha}","comments_url":"https://api.github.com/repos/doublerebel/strider-git/comments{/number}","issue_comment_url":"https://api.github.com/repos/doublerebel/strider-git/issues/comments/{number}","contents_url":"https://api.github.com/repos/doublerebel/strider-git/contents/{+path}","compare_url":"https://api.github.com/repos/doublerebel/strider-git/compare/{base}...{head}","merges_url":"https://api.github.com/repos/doublerebel/strider-git/merges","archive_url":"https://api.github.com/repos/doublerebel/strider-git/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/doublerebel/strider-git/downloads","issues_url":"https://api.github.com/repos/doublerebel/strider-git/issues{/number}","pulls_url":"https://api.github.com/repos/doublerebel/strider-git/pulls{/number}","milestones_url":"https://api.github.com/repos/doublerebel/strider-git/milestones{/number}","notifications_url":"https://api.github.com/repos/doublerebel/strider-git/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/doublerebel/strider-git/labels{/name}","releases_url":"https://api.github.com/repos/doublerebel/strider-git/releases{/id}","created_at":"2015-01-26T04:55:12Z","updated_at":"2015-01-26T05:02:58Z","pushed_at":"2015-01-26T05:02:58Z","git_url":"git://github.com/doublerebel/strider-git.git","ssh_url":"git@github.com:doublerebel/strider-git.git","clone_url":"https://github.com/doublerebel/strider-git.git","svn_url":"https://github.com/doublerebel/strider-git","homepage":null,"size":106,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"Strider-CD:master","ref":"master","sha":"b9ba00163059eeedf312e01dc592b5306251eb64","user":{"login":"Strider-CD","id":2199591,"avatar_url":"https://avatars.githubusercontent.com/u/2199591?v=3","gravatar_id":"","url":"https://api.github.com/users/Strider-CD","html_url":"https://github.com/Strider-CD","followers_url":"https://api.github.com/users/Strider-CD/followers","following_url":"https://api.github.com/users/Strider-CD/following{/other_user}","gists_url":"https://api.github.com/users/Strider-CD/gists{/gist_id}","starred_url":"https://api.github.com/users/Strider-CD/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Strider-CD/subscriptions","organizations_url":"https://api.github.com/users/Strider-CD/orgs","repos_url":"https://api.github.com/users/Strider-CD/repos","events_url":"https://api.github.com/users/Strider-CD/events{/privacy}","received_events_url":"https://api.github.com/users/Strider-CD/received_events","type":"Organization","site_admin":false},"repo":{"id":12748653,"name":"strider-git","full_name":"Strider-CD/strider-git","owner":{"login":"Strider-CD","id":2199591,"avatar_url":"https://avatars.githubusercontent.com/u/2199591?v=3","gravatar_id":"","url":"https://api.github.com/users/Strider-CD","html_url":"https://github.com/Strider-CD","followers_url":"https://api.github.com/users/Strider-CD/followers","following_url":"https://api.github.com/users/Strider-CD/following{/other_user}","gists_url":"https://api.github.com/users/Strider-CD/gists{/gist_id}","starred_url":"https://api.github.com/users/Strider-CD/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Strider-CD/subscriptions","organizations_url":"https://api.github.com/users/Strider-CD/orgs","repos_url":"https://api.github.com/users/Strider-CD/repos","events_url":"https://api.github.com/users/Strider-CD/events{/privacy}","received_events_url":"https://api.github.com/users/Strider-CD/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Strider-CD/strider-git","description":"Basic git provider","fork":false,"url":"https://api.github.com/repos/Strider-CD/strider-git","forks_url":"https://api.github.com/repos/Strider-CD/strider-git/forks","keys_url":"https://api.github.com/repos/Strider-CD/strider-git/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Strider-CD/strider-git/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Strider-CD/strider-git/teams","hooks_url":"https://api.github.com/repos/Strider-CD/strider-git/hooks","issue_events_url":"https://api.github.com/repos/Strider-CD/strider-git/issues/events{/number}","events_url":"https://api.github.com/repos/Strider-CD/strider-git/events","assignees_url":"https://api.github.com/repos/Strider-CD/strider-git/assignees{/user}","branches_url":"https://api.github.com/repos/Strider-CD/strider-git/branches{/branch}","tags_url":"https://api.github.com/repos/Strider-CD/strider-git/tags","blobs_url":"https://api.github.com/repos/Strider-CD/strider-git/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Strider-CD/strider-git/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Strider-CD/strider-git/git/refs{/sha}","trees_url":"https://api.github.com/repos/Strider-CD/strider-git/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Strider-CD/strider-git/statuses/{sha}","languages_url":"https://api.github.com/repos/Strider-CD/strider-git/languages","stargazers_url":"https://api.github.com/repos/Strider-CD/strider-git/stargazers","contributors_url":"https://api.github.com/repos/Strider-CD/strider-git/contributors","subscribers_url":"https://api.github.com/repos/Strider-CD/strider-git/subscribers","subscription_url":"https://api.github.com/repos/Strider-CD/strider-git/subscription","commits_url":"https://api.github.com/repos/Strider-CD/strider-git/commits{/sha}","git_commits_url":"https://api.github.com/repos/Strider-CD/strider-git/git/commits{/sha}","comments_url":"https://api.github.com/repos/Strider-CD/strider-git/comments{/number}","issue_comment_url":"https://api.github.com/repos/Strider-CD/strider-git/issues/comments/{number}","contents_url":"https://api.github.com/repos/Strider-CD/strider-git/contents/{+path}","compare_url":"https://api.github.com/repos/Strider-CD/strider-git/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Strider-CD/strider-git/merges","archive_url":"https://api.github.com/repos/Strider-CD/strider-git/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Strider-CD/strider-git/downloads","issues_url":"https://api.github.com/repos/Strider-CD/strider-git/issues{/number}","pulls_url":"https://api.github.com/repos/Strider-CD/strider-git/pulls{/number}","milestones_url":"https://api.github.com/repos/Strider-CD/strider-git/milestones{/number}","notifications_url":"https://api.github.com/repos/Strider-CD/strider-git/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Strider-CD/strider-git/labels{/name}","releases_url":"https://api.github.com/repos/Strider-CD/strider-git/releases{/id}","created_at":"2013-09-11T05:50:49Z","updated_at":"2014-11-29T17:56:30Z","pushed_at":"2014-11-29T18:56:53Z","git_url":"git://github.com/Strider-CD/strider-git.git","ssh_url":"git@github.com:Strider-CD/strider-git.git","clone_url":"https://github.com/Strider-CD/strider-git.git","svn_url":"https://github.com/Strider-CD/strider-git","homepage":null,"size":280,"stargazers_count":4,"watchers_count":4,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":11,"mirror_url":null,"open_issues_count":4,"forks":11,"open_issues":4,"watchers":4,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Strider-CD/strider-git/pulls/19"},"html":{"href":"https://github.com/Strider-CD/strider-git/pull/19"},"issue":{"href":"https://api.github.com/repos/Strider-CD/strider-git/issues/19"},"comments":{"href":"https://api.github.com/repos/Strider-CD/strider-git/issues/19/comments"},"review_comments":{"href":"https://api.github.com/repos/Strider-CD/strider-git/pulls/19/comments"},"review_comment":{"href":"https://api.github.com/repos/Strider-CD/strider-git/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/Strider-CD/strider-git/pulls/19/commits"},"statuses":{"href":"https://api.github.com/repos/Strider-CD/strider-git/statuses/68c1e88cd42c8e4b9746f49130b1fbe9890cd75d"}},"merged":false,"mergeable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"commits":1,"additions":8,"deletions":9,"changed_files":1}}