Merge project with maintained version #133
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Implement possible fix for git 2.17 issue with string case. Suggested a better fix for later. - Implemented python stashed support. Is this in Haskell version? Will have to check. - Reorganized zshrc.sh to be a bit clearer. Few changes such as theme and formatting to align with bash-git-prompt. - Small tidy up to the README.
- All commands checked for bad return. No longer need stderr connected.
- Issue was a simple typo in zshrc.sh - Revert gitstatus.py to printing on line.
- Really need to get some tests to help cover this.
- Simple logic problem was the root. - Update gitignore, mainly usual python test dirs and stack's dirs.
- Will check for style issues and run unit tests.
- FIX: Prompt was not showing when detached HEAD. - BUG: pytest fails from tox, will investigate.
- Tox env has no configured user information. - Generate work folders from tempfile.
- Test on 2.7, 3.4, 3.5, 3.6. - 3.2, 3.3 should work but getting excessive. - 2.6.x and 3.1.x are unsupported based on code at this time.
- Simple suffix to branch name. Will appear if detached is local too. - Travis locked to master build.
- Remove all need for commands except for: git status --branch --porcelain - Parse porcelain capture status for repo's staged/unstaged changes. - Parse porcelain capture for difference from remote if set. - Fetch stash number and hash directly from files in .git - Now parsing upstream name, can be set on prompt at later date when changes facilitate.
- Notes for future improvements.
- When no stdin detected, fallback to running own command.
- Script aware now if in worktree or not, no visual difference in prompt at this point.
- Typo in zshrc.sh
- Ensure consistent colouring by using resets around output.
- Increase function purity by reducing global usage.
- Overhaul of tests. Clearly separate functional and integration tests. - git_paths now resolves possible merge_file and rebase_dir, not guaranteed to exist. - Update README to show all possible branch states, including merging and rebase now added.
- Clarify diverge test, different numbers.
mgild
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.