Skip to content

Commit

Permalink
update from main
Browse files Browse the repository at this point in the history
  • Loading branch information
Leah Wasser committed Nov 24, 2021
2 parents a6fcddd + f680b89 commit 5c7d7d6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`

[unreleased]
------------
- Remove old unused code from before the big redirection (@kcranston, #449)
- Remove old unused code from before the big redirection (@kcranston, #449, #465)
- Reoganize github module into smaller chunks (@kcranston, #447)
- Check for working ssh keys before git commands that connect to github (@kcranston, #366)
- Fix bug where git pull method was still trying to use master as the default branch rather than main (@kcranston, #376)
Expand Down
16 changes: 0 additions & 16 deletions abcclassroom/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
# Methods for command line git operations. See github.py for
# methods that involve the GitHub API

import random
import string
import subprocess
import sys

Expand Down Expand Up @@ -142,20 +140,6 @@ def repo_changed(directory):
return bool(ret.stdout)


# TODO: DO WE USE THIS? i can't find it called anywhere
def new_branch(directory, name=None):
"""Create a new git branch in directory"""
if name is None:
postfix = "".join(
[random.choice(string.ascii_letters) for n in range(4)]
)
name = "new-material-{}".format(postfix)

_call_git("checkout", "-b", name, directory=directory)

return name


def get_commit_message():
default_message = """
# Please enter the commit message for your changes. Lines starting
Expand Down

0 comments on commit 5c7d7d6

Please sign in to comment.