summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
2015-10-18Since a number is no longer taken after --fetch_t we can remove the parameterSteven Hall1-2/+2
substitution that has been removed in this commit.
2015-10-18Moved comments back to original position.Steven Hall1-4/+4
2015-10-18Missed a fetch_t in the git_radar file to remove.Steven Hall1-1/+0
2015-10-18Custom Fetch time now uses a variableSteven Hall4-32/+32
Set the variable GIT_RADAR_FETCH_TIME in a bashrc, zshrc or gitradarrc file to customize the fetch time.
2015-10-18Merge remote-tracking branch 'upstream/master' into hotfix/unittestsClaudio Bandera6-3/+117
Conflicts: radar-base.sh
2015-10-16Fixed an error in my parameter subsitution.Steven Hall1-1/+1
2015-10-16Remove a awk callsSeth Mason1-2/+2
Turns out it had a bug when the branch name had a slash in it.
2015-10-16Made changes recommeneded by @michaeldfallenSteven Hall3-9/+15
in fetch.sh "if" now checks for $@ instead of just $1 in radar-base.sh there is now a parameter expansion on line 170 instead of the if statements. in git-radar, now there is a shift, and a regex check that the next value is a number. If the next value after --fetch_t is not a number, an error is echo'd and it resorts to the default behaviour of 5 minutes.
2015-10-16Merge pull request #79 from hallzy/issue69Michael Allen1-1/+11
Issue69
2015-10-16Merge pull request #80 from cbandera/feature/stash_indicatorMichael Allen6-3/+107
Feature/stash indicator
2015-10-16Merge pull request #1 from michaeldfallen/slackorama_masterSeth Mason2-118/+116
Small Bug fixes for @slackorama #74
2015-10-16Added missing shebang line to new test filesClaudio Bandera2-1/+3
2015-10-16Merge remote-tracking branch 'upstream/master' into hotfix/unittestsClaudio Bandera9-62/+620
2015-10-16Merge pull request #1 from michaeldfallen/hallzy_issue69Steven Hall1-1/+1
Switch to using %Y to get the modified time
2015-10-16Merge pull request #72 from srstevenson/fish-usage-typoMichael Allen1-1/+1
Add missing character in Fish snippet
cgit-1.2.3-r5 | srcnode v0.4.0