File tree Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -3,10 +3,8 @@ USERNAME=${1}
3
3
USER_UID=${2}
4
4
USER_GID=${3}
5
5
6
- if [ $USERNAME == " " ]; then
7
- exit 0
6
+ if [ ! -z " $USERNAME " ]; then
7
+ # Create the user
8
+ addgroup --gid $USER_GID $USERNAME
9
+ adduser --uid $USER_UID --gid $USER_GID --disabled-password $USERNAME
8
10
fi
9
-
10
- # Create the user
11
- addgroup --gid $USER_GID $USERNAME
12
- adduser --uid $USER_UID --gid $USER_GID --disabled-password $USERNAME
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ stash_push() {
8
8
}
9
9
10
10
stash_pop () {
11
- git apply --whitespace=nowarn < /tmp/$STASH_NAME
11
+ git apply --whitespace=nowarn < /tmp/$STASH_NAME 2> /dev/null
12
12
rm /tmp/$STASH_NAME
13
13
if [ -n " $STASH_NUM " ]; then
14
14
git stash drop -q stash@{$STASH_NUM }
You can’t perform that action at this time.
0 commit comments