GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-06-22 14:18:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More fixes for (not)improved_git (#2287)

Browse source 
* Reverting improved_git to normal in the patch creating function

* Remove two more variants of improved_git which is causing us headache
This commit is contained in:
Igor Pečovnik 2020-10-27 20:41:53 +01:00 • committed by GitHub
parent 709a484d22
commit 98f1df4e79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/compilation.sh
View file

@ -769,7 +769,7 @@ userpatch_create()
if [[ -f $patch ]]; then if [[ -f $patch ]]; then
display_alert "Applying existing $1 patch" "$patch" "wrn" && patch --batch --silent -p1 -N < "${patch}" display_alert "Applying existing $1 patch" "$patch" "wrn" && patch --batch --silent -p1 -N < "${patch}"
# read title of a patch in case Git is configured # read title of a patch in case Git is configured
if [[ -n $(improved_git config user.email) ]]; then if [[ -n $(git config user.email) ]]; then
COMMIT_MESSAGE=$(cat "${patch}" | grep Subject | sed -n -e '0,/PATCH/s/.*PATCH]//p' | xargs) COMMIT_MESSAGE=$(cat "${patch}" | grep Subject | sed -n -e '0,/PATCH/s/.*PATCH]//p' | xargs)
display_alert "Patch name extracted" "$COMMIT_MESSAGE" "wrn" display_alert "Patch name extracted" "$COMMIT_MESSAGE" "wrn"
fi fi
@ -784,7 +784,7 @@ userpatch_create()
# create patch out of changes # create patch out of changes
if ! git diff-index --quiet --cached HEAD; then if ! git diff-index --quiet --cached HEAD; then
# If Git is configured, create proper patch and ask for a name # If Git is configured, create proper patch and ask for a name
if [[ -n $(improved_git config user.email) ]]; then if [[ -n $(git config user.email) ]]; then
display_alert "Add / change patch name" "$COMMIT_MESSAGE" "wrn" display_alert "Add / change patch name" "$COMMIT_MESSAGE" "wrn"
read -e -p "Patch description: " -i "$COMMIT_MESSAGE" COMMIT_MESSAGE read -e -p "Patch description: " -i "$COMMIT_MESSAGE" COMMIT_MESSAGE
[[ -z "$COMMIT_MESSAGE" ]] && COMMIT_MESSAGE="Patching something" [[ -z "$COMMIT_MESSAGE" ]] && COMMIT_MESSAGE="Patching something"