Skip to content

Fix git command for detecting changed files in multi-parent merge commits #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
h4iku wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix git command for detecting changed files in multi-parent merge commits #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework/bin/bugsinpy-checkout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ cd "$work_dir/$project_name"
git reset --hard "$fix_commit"

###Copy updated files in the fixed version to temp
check_file=$(git show --name-only 2>&1)
check_file=$(git show --name-only --first-parent 2>&1)
change_file_all=""
while IFS= read -r line; do
if [ "$line" != "" ]; then
Expand Down