Clear staging area before initializing branch (#33)

amousavigourabi · Aug 17, 2023 · 2d33445 · 2d33445
2 parents 4304463 + 250eba8
commit 2d33445
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/action.yml b/action.yml
@@ -56,7 +56,7 @@ runs:
     - name: 'Commit and push the changed files'
       run: |
         sudo ${{ github.action_path }}/setup-branch.sh ${{ inputs.branch }}
-        git stage -A ${{ inputs.files }}
+        sudo git stage -A ${{ inputs.files }}
         sudo ${{ github.action_path }}/commit.sh "${{ inputs.message }}" ${{ inputs.allow-empty }}
         sudo ${{ github.action_path }}/push.sh ${{ inputs.branch }}
       shell: bash
diff --git a/setup-branch.sh b/setup-branch.sh
@@ -8,6 +8,7 @@ then
   git switch $1
 else
   git switch --orphan $1
+  git rm --cached -r .
   git commit --allow-empty -m "Initialize branch"
 fi
 git merge --squash --strategy-option=theirs --allow-unrelated-histories $work_branch