Skip to content

Commit 5be6007

Browse files
gitstergitster
committed
Rewrite "git-frotz" to "git frotz"
This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 36e5e70 commit 5be6007

File tree

142 files changed

+2094
-2094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+2094
-2094
lines changed

‎Documentation/install-doc-quick.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ USAGE='<refname> <target directory>'
1010
export GIT_DIR
1111

1212
test -z "$mandir" && usage
13-
if ! git-rev-parse --verify "$head^0" >/dev/null; then
13+
if ! git rev-parse --verify "$head^0" >/dev/null; then
1414
echo >&2 "head: $head does not exist in the current repository"
1515
usage
1616
fi
1717

1818
GIT_INDEX_FILE=`pwd`/.quick-doc.index
1919
export GIT_INDEX_FILE
2020
rm -f "$GIT_INDEX_FILE"
21-
git-read-tree $head
22-
git-checkout-index -a -f --prefix="$mandir"/
21+
git read-tree $head
22+
git checkout-index -a -f --prefix="$mandir"/
2323

2424
if test -n "$GZ"; then
2525
cd "$mandir"
26-
for i in `git-ls-tree -r --name-only $head`
26+
for i in `git ls-tree -r --name-only $head`
2727
do
2828
gzip < $i > $i.gz && rm $i
2929
done

‎contrib/examples/git-gc.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ notbare|"")
3030
esac
3131

3232
test "true" != "$pack_refs" ||
33-
git-pack-refs --prune &&
34-
git-reflog expire --all &&
33+
git pack-refs --prune &&
34+
git reflog expire --all &&
3535
git-repack -a -d -l &&
36-
$no_prune git-prune &&
37-
git-rerere gc || exit
36+
$no_prune git prune &&
37+
git rerere gc || exit

‎contrib/examples/git-resolve.sh‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ dropheads() {
1717
"$GIT_DIR/LAST_MERGE" || exit 1
1818
}
1919

20-
head=$(git-rev-parse --verify "$1"^0) &&
21-
merge=$(git-rev-parse --verify "$2"^0) &&
20+
head=$(git rev-parse --verify "$1"^0) &&
21+
merge=$(git rev-parse --verify "$2"^0) &&
2222
merge_name="$2" &&
2323
merge_msg="$3" || usage
2424

@@ -34,7 +34,7 @@ dropheads
3434
echo $head > "$GIT_DIR"/ORIG_HEAD
3535
echo $merge > "$GIT_DIR"/LAST_MERGE
3636

37-
common=$(git-merge-base $head $merge)
37+
common=$(git merge-base $head $merge)
3838
if [ -z "$common" ]; then
3939
die "Unable to find common commit between" $merge $head
4040
fi
@@ -46,11 +46,11 @@ case "$common" in
4646
exit 0
4747
;;
4848
"$head")
49-
echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $merge)"
50-
git-read-tree -u -m $head $merge || exit 1
51-
git-update-ref -m "resolve $merge_name: Fast forward" \
49+
echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $merge)"
50+
git read-tree -u -m $head $merge || exit 1
51+
git update-ref -m "resolve $merge_name: Fast forward" \
5252
HEAD "$merge" "$head"
53-
git-diff-tree -p $head $merge | git-apply --stat
53+
git diff-tree -p $head $merge | git apply --stat
5454
dropheads
5555
exit 0
5656
;;
@@ -62,7 +62,7 @@ git var GIT_COMMITTER_IDENT >/dev/null || exit
6262
# Find an optimum merge base if there are more than one candidates.
6363
LF='
6464
'
65-
common=$(git-merge-base -a $head $merge)
65+
common=$(git merge-base -a $head $merge)
6666
case "$common" in
6767
?*"$LF"?*)
6868
echo "Trying to find the optimum merge base."
@@ -72,10 +72,10 @@ case "$common" in
7272
for c in $common
7373
do
7474
rm -f $G
75-
GIT_INDEX_FILE=$G git-read-tree -m $c $head $merge \
75+
GIT_INDEX_FILE=$G git read-tree -m $c $head $merge \
7676
2>/dev/null || continue
7777
# Count the paths that are unmerged.
78-
cnt=`GIT_INDEX_FILE=$G git-ls-files --unmerged | wc -l`
78+
cnt=`GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l`
7979
if test $best_cnt -le 0 -o $cnt -le $best_cnt
8080
then
8181
best=$c
@@ -92,21 +92,21 @@ case "$common" in
9292
esac
9393

9494
echo "Trying to merge $merge into $head using $common."
95-
git-update-index --refresh 2>/dev/null
96-
git-read-tree -u -m $common $head $merge || exit 1
97-
result_tree=$(git-write-tree 2> /dev/null)
95+
git update-index --refresh 2>/dev/null
96+
git read-tree -u -m $common $head $merge || exit 1
97+
result_tree=$(git write-tree 2> /dev/null)
9898
if [ $? -ne 0 ]; then
9999
echo "Simple merge failed, trying Automatic merge"
100100
git-merge-index -o git-merge-one-file -a
101101
if [ $? -ne 0 ]; then
102102
echo $merge > "$GIT_DIR"/MERGE_HEAD
103103
die "Automatic merge failed, fix up by hand"
104104
fi
105-
result_tree=$(git-write-tree) || exit 1
105+
result_tree=$(git write-tree) || exit 1
106106
fi
107-
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
107+
result_commit=$(echo "$merge_msg" | git commit-tree $result_tree -p $head -p $merge)
108108
echo "Committed merge $result_commit"
109-
git-update-ref -m "resolve $merge_name: In-index merge" \
109+
git update-ref -m "resolve $merge_name: In-index merge" \
110110
HEAD "$result_commit" "$head"
111-
git-diff-tree -p $head $result_commit | git-apply --stat
111+
git diff-tree -p $head $result_commit | git apply --stat
112112
dropheads

‎contrib/remotes2config.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ if [ -d "$GIT_DIR"/remotes ]; then
2626
mv "$GIT_DIR"/remotes "$GIT_DIR"/remotes.old
2727
fi ;;
2828
*)
29-
echo "git-config $key "$value" $regex"
30-
git-config $key "$value" $regex || error=1 ;;
29+
echo "git config $key "$value" $regex"
30+
git config $key "$value" $regex || error=1 ;;
3131
esac
3232
done
3333
fi

‎git-am.sh‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@ fall_back_3way () {
6060
mkdir "$dotest/patch-merge-tmp-dir"
6161

6262
# First see if the patch records the index info that we can use.
63-
git-apply -z --index-info "$dotest/patch" \
63+
git apply -z --index-info "$dotest/patch" \
6464
>"$dotest/patch-merge-index-info" &&
6565
GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
66-
git-update-index -z --index-info <"$dotest/patch-merge-index-info" &&
66+
git update-index -z --index-info <"$dotest/patch-merge-index-info" &&
6767
GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
68-
git-write-tree >"$dotest/patch-merge-base+" ||
68+
git write-tree >"$dotest/patch-merge-base+" ||
6969
cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge."
7070

7171
echo Using index info to reconstruct a base tree...
7272
if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
73-
git-apply $binary --cached <"$dotest/patch"
73+
git apply $binary --cached <"$dotest/patch"
7474
then
7575
mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
7676
mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
@@ -80,7 +80,7 @@ It does not apply to blobs recorded in its index."
8080
fi
8181

8282
test -f "$dotest/patch-merge-index" &&
83-
his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git-write-tree) &&
83+
his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) &&
8484
orig_tree=$(cat "$dotest/patch-merge-base") &&
8585
rm -fr "$dotest"/patch-merge-* || exit 1
8686

@@ -97,7 +97,7 @@ It does not apply to blobs recorded in its index."
9797
git-merge-recursive $orig_tree -- HEAD $his_tree || {
9898
if test -d "$GIT_DIR/rr-cache"
9999
then
100-
git-rerere
100+
git rerere
101101
fi
102102
echo Failed to merge in the changes.
103103
exit 1
@@ -198,7 +198,7 @@ else
198198
# Start afresh.
199199
mkdir -p "$dotest" || exit
200200

201-
git-mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || {
201+
git mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || {
202202
rm -fr "$dotest"
203203
exit 1
204204
}
@@ -216,7 +216,7 @@ fi
216216

217217
case "$resolved" in
218218
'')
219-
files=$(git-diff-index --cached --name-only HEAD) || exit
219+
files=$(git diff-index --cached --name-only HEAD) || exit
220220
if [ "$files" ]; then
221221
echo "Dirty index: cannot apply patches (dirty: $files)" >&2
222222
exit 1
@@ -254,7 +254,7 @@ if test "$skip" = t
254254
then
255255
if test -d "$GIT_DIR/rr-cache"
256256
then
257-
git-rerere clear
257+
git rerere clear
258258
fi
259259
this=`expr "$this" + 1`
260260
resume=
@@ -287,14 +287,14 @@ do
287287
# by the user, or the user can tell us to do so by --resolved flag.
288288
case "$resume" in
289289
'')
290-
git-mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
290+
git mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
291291
<"$dotest/$msgnum" >"$dotest/info" ||
292292
stop_here $this
293293
test -s $dotest/patch || {
294294
echo "Patch is empty. Was it split wrong?"
295295
stop_here $this
296296
}
297-
git-stripspace < "$dotest/msg" > "$dotest/msg-clean"
297+
git stripspace < "$dotest/msg" > "$dotest/msg-clean"
298298
;;
299299
esac
300300

@@ -347,7 +347,7 @@ do
347347
case "$resolved$interactive" in
348348
tt)
349349
# This is used only for interactive view option.
350-
git-diff-index -p --cached HEAD >"$dotest/patch"
350+
git diff-index -p --cached HEAD >"$dotest/patch"
351351
;;
352352
esac
353353
esac
@@ -399,7 +399,7 @@ do
399399

400400
case "$resolved" in
401401
'')
402-
git-apply $git_apply_opt $binary --index "$dotest/patch"
402+
git apply $git_apply_opt $binary --index "$dotest/patch"
403403
apply_status=$?
404404
;;
405405
t)
@@ -408,11 +408,11 @@ do
408408
# trust what the user has in the index file and the
409409
# working tree.
410410
resolved=
411-
git-diff-index --quiet --cached HEAD && {
411+
git diff-index --quiet --cached HEAD && {
412412
echo "No changes - did you forget to use 'git add'?"
413413
stop_here_user_resolve $this
414414
}
415-
unmerged=$(git-ls-files -u)
415+
unmerged=$(git ls-files -u)
416416
if test -n "$unmerged"
417417
then
418418
echo "You still have unmerged paths in your index"
@@ -433,7 +433,7 @@ do
433433
then
434434
# Applying the patch to an earlier tree and merging the
435435
# result may have produced the same tree as ours.
436-
git-diff-index --quiet --cached HEAD && {
436+
git diff-index --quiet --cached HEAD && {
437437
echo No changes -- Patch already applied.
438438
go_next
439439
continue
@@ -453,12 +453,12 @@ do
453453
"$GIT_DIR"/hooks/pre-applypatch || stop_here $this
454454
fi
455455

456-
tree=$(git-write-tree) &&
456+
tree=$(git write-tree) &&
457457
echo Wrote tree $tree &&
458-
parent=$(git-rev-parse --verify HEAD) &&
459-
commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit") &&
458+
parent=$(git rev-parse --verify HEAD) &&
459+
commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") &&
460460
echo Committed: $commit &&
461-
git-update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent ||
461+
git update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent ||
462462
stop_here $this
463463

464464
if test -x "$GIT_DIR"/hooks/post-applypatch

‎git-bisect.sh‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ bisect_start() {
5656
# Verify HEAD. If we were bisecting before this, reset to the
5757
# top-of-line master first!
5858
#
59-
head=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD) ||
59+
head=$(GIT_DIR="$GIT_DIR" git symbolic-ref HEAD) ||
6060
die "Bad HEAD - I need a symbolic ref"
6161
case "$head" in
6262
refs/heads/bisect)
@@ -99,7 +99,7 @@ bisect_start() {
9999
break
100100
;;
101101
*)
102-
rev=$(git-rev-parse --verify "$arg^{commit}" 2>/dev/null) || {
102+
rev=$(git rev-parse --verify "$arg^{commit}" 2>/dev/null) || {
103103
test $has_double_dash -eq 1 &&
104104
die "'$arg' does not appear to be a valid revision"
105105
break
@@ -124,9 +124,9 @@ bisect_bad() {
124124
bisect_autostart
125125
case "$#" in
126126
0)
127-
rev=$(git-rev-parse --verify HEAD) ;;
127+
rev=$(git rev-parse --verify HEAD) ;;
128128
1)
129-
rev=$(git-rev-parse --verify "$1^{commit}") ;;
129+
rev=$(git rev-parse --verify "$1^{commit}") ;;
130130
*)
131131
usage ;;
132132
esac || exit
@@ -138,19 +138,19 @@ bisect_bad() {
138138
bisect_write_bad() {
139139
rev="$1"
140140
echo "$rev" >"$GIT_DIR/refs/bisect/bad"
141-
echo "# bad: "$(git-show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
141+
echo "# bad: "$(git show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
142142
}
143143

144144
bisect_good() {
145145
bisect_autostart
146146
case "$#" in
147-
0) revs=$(git-rev-parse --verify HEAD) || exit ;;
148-
*) revs=$(git-rev-parse --revs-only --no-flags "$@") &&
147+
0) revs=$(git rev-parse --verify HEAD) || exit ;;
148+
*) revs=$(git rev-parse --revs-only --no-flags "$@") &&
149149
test '' != "$revs" || die "Bad rev input: $@" ;;
150150
esac
151151
for rev in $revs
152152
do
153-
rev=$(git-rev-parse --verify "$rev^{commit}") || exit
153+
rev=$(git rev-parse --verify "$rev^{commit}") || exit
154154
bisect_write_good "$rev"
155155
echo "git-bisect good $rev" >>"$GIT_DIR/BISECT_LOG"
156156

@@ -161,7 +161,7 @@ bisect_good() {
161161
bisect_write_good() {
162162
rev="$1"
163163
echo "$rev" >"$GIT_DIR/refs/bisect/good-$rev"
164-
echo "# good: "$(git-show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
164+
echo "# good: "$(git show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
165165
}
166166

167167
bisect_next_check() {
@@ -211,10 +211,10 @@ bisect_next() {
211211
bisect_autostart
212212
bisect_next_check good
213213

214-
bad=$(git-rev-parse --verify refs/bisect/bad) &&
214+
bad=$(git rev-parse --verify refs/bisect/bad) &&
215215
good=$(git for-each-ref --format='^%(objectname)' \
216216
"refs/bisect/good-*" | tr '[\012]' ' ') &&
217-
eval="git-rev-list --bisect-vars $good $bad --" &&
217+
eval="git rev-list --bisect-vars $good $bad --" &&
218218
eval="$eval $(cat "$GIT_DIR/BISECT_NAMES")" &&
219219
eval=$(eval "$eval") &&
220220
eval "$eval" || exit
@@ -225,16 +225,16 @@ bisect_next() {
225225
fi
226226
if [ "$bisect_rev" = "$bad" ]; then
227227
echo "$bisect_rev is first bad commit"
228-
git-diff-tree --pretty $bisect_rev
228+
git diff-tree --pretty $bisect_rev
229229
exit 0
230230
fi
231231

232232
echo "Bisecting: $bisect_nr revisions left to test after this"
233233
echo "$bisect_rev" >"$GIT_DIR/refs/heads/new-bisect"
234234
git checkout -q new-bisect || exit
235235
mv "$GIT_DIR/refs/heads/new-bisect" "$GIT_DIR/refs/heads/bisect" &&
236-
GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD refs/heads/bisect
237-
git-show-branch "$bisect_rev"
236+
GIT_DIR="$GIT_DIR" git symbolic-ref HEAD refs/heads/bisect
237+
git show-branch "$bisect_rev"
238238
}
239239

240240
bisect_visualize() {
@@ -250,7 +250,7 @@ bisect_reset() {
250250
else
251251
branch=master
252252
fi ;;
253-
1) git-show-ref --verify --quiet -- "refs/heads/$1" || {
253+
1) git show-ref --verify --quiet -- "refs/heads/$1" || {
254254
echo >&2 "$1 does not seem to be a valid branch"
255255
exit 1
256256
}
@@ -288,12 +288,12 @@ bisect_replay () {
288288
;;
289289
good)
290290
echo "$rev" >"$GIT_DIR/refs/bisect/good-$rev"
291-
echo "# good: "$(git-show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
291+
echo "# good: "$(git show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
292292
echo "git-bisect good $rev" >>"$GIT_DIR/BISECT_LOG"
293293
;;
294294
bad)
295295
echo "$rev" >"$GIT_DIR/refs/bisect/bad"
296-
echo "# bad: "$(git-show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
296+
echo "# bad: "$(git show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
297297
echo "git-bisect bad $rev" >>"$GIT_DIR/BISECT_LOG"
298298
;;
299299
*)

0 commit comments

Comments
 (0)