summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-08-24git-sonar v0.8HEADv0.8masterMalfurious1-0/+3
Signed-off-by: Malfurious <m@lfurio.us>
2021-08-24Update README for new releaseMalfurious1-74/+18
Signed-off-by: Malfurious <m@lfurio.us>
2021-08-24Add explicit --help outputMalfurious1-34/+15
-h or --help will now display the usage information on the command-line. Additionally, -f is offered as a short form of --fetch. As a consequence of this, it is no longer necessary to specify --bash/--fish/etc. to get the prompt to render. (However, these options will continue to be recognized by the script, for compatibility with git-radar.) The content of the help text is also updated for accuracy. Shell specific examples are removed (see the README). Signed-off-by: Malfurious <m@lfurio.us>
2021-08-23Remove dead codeMalfurious1-119/+0
Some code in the main script was only serving use in the (now deleted) tests. Remove anything from the main file with no references to it. Signed-off-by: Malfurious <m@lfurio.us>
2021-08-23Remove unit testsMalfurious19-4211/+0
I don't particularly wish to maintain these tests for a few reasons: * Many of them make assertions strictly about rendered text / UI * Many of them test external systems and touch the disk * There are platform-dependent details that complicate several tests. So, the tests are removed. Ideally, the main script is reworked into something simple enough it doesn't necessarily warrant heavy testing. Signed-off-by: Malfurious <m@lfurio.us>
2021-08-04Properly Reset Colors After Stash Statusdusoleil1-1/+1
If a custom color is used for the stash icon, git-sonar needs to reset the color after the icon. It was using the wrong variable for this reset. Signed-off-by: dusoleil <howcansocksbereal@gmail.com> Signed-off-by: Malfurious <m@lfurio.us>
2021-08-04Add Control Characters back to Color Config to Fix Line Wrappingdusoleil1-18/+19
"\001" (Start of Heading) and "\002" (Start of Text) control characters were mistakenly removed from the color config part of the main script. Some shells (e.g. bash) struggle with line wrapping issues without these. Bash needs them to calculate which characters are printable and which aren't for figuring out where to linewrap. This patch just adds them back in. Signed-off-by: dusoleil <howcansocksbereal@gmail.com> Signed-off-by: Malfurious <m@lfurio.us>
2021-08-02Rewrite MakefileMalfurious1-28/+20
The Makefile is updated to deal with the single 'git-sonar' file only, now that the others have been merged into it. Additionally, several issues have been fixed with the file, including: * Now easier to override the PREFIX variable (install location) * PWD works properly when running make with sudo * Install now default to system-wide * bin directory now explicitly created if it doesn't exist A specific problem corrected by this patch is that `PREFIX=$HOME/.local make install` on a fresh system will no longer result in the script being copied to the _regular file_ $HOME/.local/bin, because bin did not exist. Signed-off-by: Malfurious <m@lfurio.us>
2021-08-02Merge sonar-base into git-sonar main fileMalfurious2-630/+632
The script is now contained in a single file. This file will be cleaned/refactored over time. Signed-off-by: Malfurious <m@lfurio.us>
2021-07-22Refactor fetch.shMalfurious3-15/+2
Some code is restructured to remove the need for this additional entry-point. Signed-off-by: Malfurious <m@lfurio.us>
2021-07-20Merge bash/zsh/fish color modes togetherMalfurious4-92/+26
This commit removes the differences between the supported shells and removes the options: --bash, --fish, and --zsh. I can not produce any problems in any of these shells using a generic form of the text coloring (ie: the one bash was using), so for simplicity I will opt to unify the way colors are handled and remove knowledge of the running shell. Something that _may_ end up being a problem is properly rendering the prompt in different terminal emulators. If this is of concern, it will be dealt with at a later time. Signed-off-by: Malfurious <m@lfurio.us>
2021-07-20Remove editor-specific gitignoreMalfurious1-2/+0
Signed-off-by: Malfurious <m@lfurio.us>
2021-07-20Move test files to subdirectoryMalfurious19-0/+0
Signed-off-by: Malfurious <m@lfurio.us>
2021-04-25Remove imagesMalfurious14-0/+0
Signed-off-by: Malfurious <m@lfurio.us>
2021-04-25Apply several suggestions from shellcheckMalfurious5-82/+104
Signed-off-by: Malfurious <m@lfurio.us>
2021-03-24Merge branch 'rebranding'v0.7Malfurious18-48/+48
2021-03-24Rename files to git-sonarMalfurious3-0/+0
Signed-off-by: Malfurious <m@lfurio.us>
2021-03-24Update references to project name to git-sonarMalfurious17-48/+48
Signed-off-by: Malfurious <m@lfurio.us>
2021-03-24Fix issue with test-colors 'git pull' commandsMalfurious1-2/+2
If the user's git is configured with 'pull.ff = only', these lines would fail since the two repositories have diverged from each other. '--ff' is added to restore the original default of allowing either a fast-forward or recursive merge to take place. In reality, an implicit 3-way merge is being performed. All tests now pass. Signed-off-by: Malfurious <m@lfurio.us>
2021-03-24Merge branch 'hotfix/unittests' of https://github.com/cbandera/git-radarMalfurious9-40/+70
Merge pending pull request #67 of upstream git-radar project from user cbandera. They write: This is a pull request to fix issue #38. As it turns out, some built in commands behave differently on Mac OS X and Linux. In order to run the tests on Linux, I have added switch statements at some points to call the functions with the respective syntax. Also I realized, that the tests only worked for me when I set the following options: git config --global push.default simple git config --global branch.autosetuprebase never But that's probably just because these should be the defaults. I normally have them set to something else...
2021-03-24Merge branch 'feature/git-directory-patch' of ↵Malfurious1-2/+8
https://github.com/rholmboe/git-radar Merge pending pull request #107 of upstream git-radar project from user rholmboe. Note I did manually resolve a fairly trivial conflict in the is_cwd_a_dot_git_directory() function. From the original PR: Bug #98 wasn't really propagated correctly, you still got git-fetch bug when you entered a sub-directory in .git. Now it's recursive, faster and still POSIX compliant.
2021-03-24Merge branch 'add_typechanged' of https://github.com/hallzy/git-radarMalfurious1-0/+8
Merge pending pull request #111 of upstream git-radar project from user hallzy. They write: I came across "typechanged" the other day in my git status. It occurs when (for example) you change a file from being a regular file, to a symlink. Not sure if you want this in. I am using "TC" in the terminal to show this. I would also like a check on the grep's in the lines that I added. I understand that everything inside of the square brackets can be matched, but I am unsure what letters I would also need with this.
2021-03-24Merge branch 'master' of https://github.com/m007/git-radarMalfurious1-2/+12
Merge pending pull request #119 of upstream git-radar project from user m007. They write: This commit allows the user to define a per repository or per branch specific configuration of which branch git-radar compares the current branch to. If no branch is configured explicitly "origin/master" will be used (being backwards compatible with the current behaviour). A branch specific remote tracking branch may be configured by executing git config --local branch."$(git rev-parse --abbrev-ref HEAD)".git-radar-tracked-remote origin/my-branch-to-compare-to A repository specific remote tracking may be configured by executing git config --local git-radar.tracked-remote origin/my-branch-to-compare-to A branch specific setting will overwrite a repository specific configuration (which will overwrite the default, i.e origin/master).
2021-03-23Merge branch 'switch-untracked-symbol' of ↵Malfurious5-115/+115
https://github.com/michaeldfallen/git-radar
2020-01-29Let the remote tracking branch be configurableMatthias Baumgarten1-2/+12
This commit allows the user to define a per repository or per branch specific configuration of which branch git-radar compares the current branch to. If no branch is configured explicitly "origin/master" will be used (being backwards compatible with the current behaviour). A branch specific remote tracking branch may be configured by executing git config --local branch."$(git rev-parse --abbrev-ref HEAD)".git-radar-tracked-remote origin/my-branch-to-compare-to A repository specific remote tracking may be configured by executing git config --local git-radar.tracked-remote origin/my-branch-to-compare-to A branch specific setting will overwrite a repository specific configuration (which will overwrite the default, i.e origin/master).
2017-03-28Merge branch 'master' into hotfix/unittestsClaudio Bandera2-1/+6
2017-03-07Added TC for typechanged statusSteven Hall1-0/+8
2017-01-08fix for basename: extra operand warningcrf2041-1/+1
2016-11-02Merge pull request #106 from bogem/forMichaelMichael Allen1-0/+5
Add lightweight version to README
2016-10-24Add lightweight version to READMEbogem1-0/+5
2016-09-28Added additional checks for .git and sub-directories. This patch also ↵Richard Holmboe1-2/+8
includes using POSIX native commands and going away from basename/dirname
2016-04-24Merge remote-tracking branch 'upstream/master' into hotfix/unittestsClaudio Bandera5-124/+175
2016-02-03Fix '= not found' issueMichael Allen1-1/+1
2016-01-22Merge pull request #99 from hallzy/masterMichael Allen1-5/+11
Resolve issue #98 - Git stash error when entering .git Directory
2016-01-21Resolve issue #98Steven Hall1-5/+11
radar-base.sh now checks to see if the current directory is a .git directory. If it is, it skips the git stash part.
2016-01-07Merge pull request #97 from pkernevez/masterMichael Allen1-1/+1
Remove the '\n' that put the cursor on a new line (prompt on 2 lines instead of one)
2016-01-05Remove the '\n' that put the cursor on a new line (prompt on 2 lines instead ↵P.Kernevez1-1/+1
of one)
2015-11-10Merge pull request #90 from matthillman/osx_stash_fixv0.6Michael Allen1-1/+1
Fix for bad characters showing in the stash status in OS X
2015-11-09Surround all variables on stash_status()’s return line with {} for clarityMatthew Hillman1-1/+1
2015-11-06Fix for bad characters showing in the stash status in OS XMatthew Hillman1-1/+1
2015-11-05Merge pull request #89 from colinsf/untracked-branch-fixMichael Allen1-2/+2
Redirect Branch Lookup Error Output
2015-11-01bury error output from remote branch lookupColin Scott-Fleming1-2/+2
closes #88 closes #86
2015-10-29Those tests shouldn't have been commented outMichael Allen1-106/+106
2015-10-29Switch the untracked symbol to ?Michael Allen5-9/+9
2015-10-27Merge pull request #70 from hallzy/masterv0.5Michael Allen4-3/+45
Added feature that let's you specify how often to fetch
2015-10-21Merge pull request #2 from michaeldfallen/hallzy_#70Steven Hall8-120/+241
Hallzy #70
2015-10-21Fix tests broken by FETCH_TIME now being pushed inMichael Allen2-1/+5
2015-10-21Merge branch 'master' of github.com:michaeldfallen/git-radar into hallzy_#70Michael Allen7-119/+236
2015-10-21Merge pull request #82 from slackorama/feature/ditch-awkMichael Allen2-111/+114
Feature/ditch awk
2015-10-20Merge pull request #78 from jhunold/sed_fixMichael Allen1-1/+1
Escape all forward slashes
cgit-1.2.3-r5 | srcnode v0.4.0