Page MenuHomeFreeBSD
Files F111588175

D36248.diff
No OneTemporary
Actions

D36248.diff
View Options

diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh
--- a/tools/tools/git/git-arc.sh
+++ b/tools/tools/git/git-arc.sh
@@ -245,8 +245,6 @@
return 1
fi
- git checkout -q "$commit"
-
msg=$(mktemp)
git show -s --format='%B' "$commit" > "$msg"
printf "\nTest Plan:\n" >> "$msg"
@@ -256,7 +254,8 @@
printf "%s\n" "${subscribers}" >> "$msg"
yes | env EDITOR=true \
- arc diff --message-file "$msg" --never-apply-patches --create --allow-untracked $BROWSE HEAD~
+ arc diff --message-file "$msg" --never-apply-patches --create \
+ --allow-untracked $BROWSE --head "$commit" "${commit}~"
[ $? -eq 0 ] || err "could not create Phabricator diff"
if [ -n "$parent" ]; then
@@ -333,24 +332,6 @@
prompt
}
-save_head()
-{
- local orig
-
- if ! orig=$(git symbolic-ref --short -q HEAD); then
- orig=$(git show -s --pretty=%H HEAD)
- fi
- SAVED_HEAD=$orig
-}
-
-restore_head()
-{
- if [ -n "$SAVED_HEAD" ]; then
- git checkout -q "$SAVED_HEAD"
- SAVED_HEAD=
- fi
-}
-
build_commit_list()
{
local chash _commits commits
@@ -410,7 +391,6 @@
doprompt=
fi
- save_head
for commit in ${commits}; do
if create_one_review "$commit" "$reviewers" "$subscribers" "$prev" \
"$doprompt"; then
@@ -419,7 +399,6 @@
prev=""
fi
done
- restore_head
}
gitarc__list()
@@ -524,7 +503,6 @@
local commit commits diff
commits=$(build_commit_list "$@")
- save_head
for commit in ${commits}; do
diff=$(commit2diff "$commit")
@@ -532,14 +510,12 @@
break
fi
- git checkout -q "$commit"
-
# The linter is stupid and applies patches to the working copy.
# This would be tolerable if it didn't try to correct "misspelled" variable
# names.
- arc diff --allow-untracked --never-apply-patches --update "$diff" HEAD~
+ arc diff --allow-untracked --never-apply-patches --update "$diff" \
+ --head "$commit" "${commit}~"
done
- restore_head
}
set -e
@@ -613,6 +589,4 @@
BROWSE=--browse
fi
-trap restore_head EXIT INT
-
gitarc__"${verb}" "$@"

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 6, 4:09 PM (9 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17016645
Default Alt Text
D36248.diff (2 KB)

Event Timeline