forked from Shinonome/dots-hyprland
Update submodule in exp-update (#2334)
This commit is contained in:
@@ -541,6 +541,7 @@ if git remote get-url origin &>/dev/null; then
|
|||||||
log_info "Pulling changes from origin/$current_branch..."
|
log_info "Pulling changes from origin/$current_branch..."
|
||||||
if git pull; then
|
if git pull; then
|
||||||
log_success "Successfully pulled latest changes"
|
log_success "Successfully pulled latest changes"
|
||||||
|
git submodule update --init --recursive
|
||||||
else
|
else
|
||||||
log_warning "Failed to pull changes from remote. Continuing with local repository..."
|
log_warning "Failed to pull changes from remote. Continuing with local repository..."
|
||||||
log_info "You may need to resolve conflicts manually later."
|
log_info "You may need to resolve conflicts manually later."
|
||||||
|
|||||||
@@ -844,6 +844,7 @@ if git remote get-url origin &>/dev/null; then
|
|||||||
else
|
else
|
||||||
if git pull --ff-only; then
|
if git pull --ff-only; then
|
||||||
log_success "Successfully pulled latest changes"
|
log_success "Successfully pulled latest changes"
|
||||||
|
git submodule update --init --recursive
|
||||||
# Verify we actually got new commits
|
# Verify we actually got new commits
|
||||||
if git rev-parse --verify HEAD@{1} &>/dev/null; then
|
if git rev-parse --verify HEAD@{1} &>/dev/null; then
|
||||||
if [[ "$(git rev-parse HEAD)" == "$(git rev-parse HEAD@{1})" ]]; then
|
if [[ "$(git rev-parse HEAD)" == "$(git rev-parse HEAD@{1})" ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user