git-commit: fix coding style.
git-commit.sh was using a mixture of spaces and tabs for indentation. This is changed to one tab per indentation level. No code changes. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Waitz committed
Oct 7, 2006 at 21:07 UTC
3de63c3f9f82cd0a43f3f69dd1e3662bc101d629
1 file changed
+233
-231
git-commit.sh
+233
-231
@@ -41,21 +41,21 @@ run_status () {
41
# so the regular index file is what we use to compare.
42
if test '' != "$TMP_INDEX"
43
then
44
- GIT_INDEX_FILE="$TMP_INDEX"
45
- export GIT_INDEX_FILE
44
+ GIT_INDEX_FILE="$TMP_INDEX"
45
+ export GIT_INDEX_FILE
46
elif test -f "$NEXT_INDEX"
47
then
48
- GIT_INDEX_FILE="$NEXT_INDEX"
49
- export GIT_INDEX_FILE
48
+ GIT_INDEX_FILE="$NEXT_INDEX"
49
+ export GIT_INDEX_FILE
50
fi
51
52
- case "$status_only" in
53
- t) color= ;;
54
- *) color=--nocolor ;;
55
- esac
56
- git-runstatus ${color} \
57
- ${verbose:+--verbose} \
58
- ${amend:+--amend} \
52
+ case "$status_only" in
53
+ t) color= ;;
54
+ *) color=--nocolor ;;
55
+ esac
56
+ git-runstatus ${color} \
57
+ ${verbose:+--verbose} \
58
+ ${amend:+--amend} \
59
${untracked_files:+--untracked}
60
}
61
@@ -87,179 +87,181 @@ only_include_assumed=
87
untracked_files=
88
while case "$#" in 0) break;; esac
89
do
90
- case "$1" in
91
- -F|--F|-f|--f|--fi|--fil|--file)
92
- case "$#" in 1) usage ;; esac
93
- shift
94
- no_edit=t
95
- log_given=t$log_given
96
- logfile="$1"
97
- shift
98
- ;;
99
- -F*|-f*)
100
- no_edit=t
101
- log_given=t$log_given
102
- logfile=`expr "z$1" : 'z-[Ff]\(.*\)'`
103
- shift
104
- ;;
105
- --F=*|--f=*|--fi=*|--fil=*|--file=*)
106
- no_edit=t
107
- log_given=t$log_given
108
- logfile=`expr "z$1" : 'z-[^=]*=\(.*\)'`
109
- shift
110
- ;;
111
- -a|--a|--al|--all)
112
- all=t
113
- shift
114
- ;;
115
- --au=*|--aut=*|--auth=*|--autho=*|--author=*)
116
- force_author=`expr "z$1" : 'z-[^=]*=\(.*\)'`
117
- shift
118
- ;;
119
- --au|--aut|--auth|--autho|--author)
120
- case "$#" in 1) usage ;; esac
121
- shift
122
- force_author="$1"
123
- shift
124
- ;;
125
- -e|--e|--ed|--edi|--edit)
126
- edit_flag=t
127
- shift
128
- ;;
129
- -i|--i|--in|--inc|--incl|--inclu|--includ|--include)
130
- also=t
131
- shift
132
- ;;
133
- -o|--o|--on|--onl|--only)
134
- only=t
135
- shift
136
- ;;
137
- -m|--m|--me|--mes|--mess|--messa|--messag|--message)
138
- case "$#" in 1) usage ;; esac
139
- shift
140
- log_given=m$log_given
141
- if test "$log_message" = ''
142
- then
143
- log_message="$1"
144
- else
145
- log_message="$log_message
90
+ case "$1" in
91
+ -F|--F|-f|--f|--fi|--fil|--file)
92
+ case "$#" in 1) usage ;; esac
93
+ shift
94
+ no_edit=t
95
+ log_given=t$log_given
96
+ logfile="$1"
97
+ shift
98
+ ;;
99
+ -F*|-f*)
100
+ no_edit=t
101
+ log_given=t$log_given
102
+ logfile=`expr "z$1" : 'z-[Ff]\(.*\)'`
103
+ shift
104
+ ;;
105
+ --F=*|--f=*|--fi=*|--fil=*|--file=*)
106
+ no_edit=t
107
+ log_given=t$log_given
108
+ logfile=`expr "z$1" : 'z-[^=]*=\(.*\)'`
109
+ shift
110
+ ;;
111
+ -a|--a|--al|--all)
112
+ all=t
113
+ shift
114
+ ;;
115
+ --au=*|--aut=*|--auth=*|--autho=*|--author=*)
116
+ force_author=`expr "z$1" : 'z-[^=]*=\(.*\)'`
117
+ shift
118
+ ;;
119
+ --au|--aut|--auth|--autho|--author)
120
+ case "$#" in 1) usage ;; esac
121
+ shift
122
+ force_author="$1"
123
+ shift
124
+ ;;
125
+ -e|--e|--ed|--edi|--edit)
126
+ edit_flag=t
127
+ shift
128
+ ;;
129
+ -i|--i|--in|--inc|--incl|--inclu|--includ|--include)
130
+ also=t
131
+ shift
132
+ ;;
133
+ -o|--o|--on|--onl|--only)
134
+ only=t
135
+ shift
136
+ ;;
137
+ -m|--m|--me|--mes|--mess|--messa|--messag|--message)
138
+ case "$#" in 1) usage ;; esac
139
+ shift
140
+ log_given=m$log_given
141
+ if test "$log_message" = ''
142
+ then
143
+ log_message="$1"
144
+ else
145
+ log_message="$log_message
146
147
$1"
148
- fi
149
- no_edit=t
150
- shift
151
- ;;
152
- -m*)
153
- log_given=m$log_given
154
- if test "$log_message" = ''
155
- then
156
- log_message=`expr "z$1" : 'z-m\(.*\)'`
157
- else
158
- log_message="$log_message
148
+ fi
149
+ no_edit=t
150
+ shift
151
+ ;;
152
+ -m*)
153
+ log_given=m$log_given
154
+ if test "$log_message" = ''
155
+ then
156
+ log_message=`expr "z$1" : 'z-m\(.*\)'`
157
+ else
158
+ log_message="$log_message
159
160
`expr "z$1" : 'z-m\(.*\)'`"
161
- fi
162
- no_edit=t
163
- shift
164
- ;;
165
- --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
166
- log_given=m$log_given
167
- if test "$log_message" = ''
168
- then
169
- log_message=`expr "z$1" : 'z-[^=]*=\(.*\)'`
170
- else
171
- log_message="$log_message
161
+ fi
162
+ no_edit=t
163
+ shift
164
+ ;;
165
+ --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
166
+ log_given=m$log_given
167
+ if test "$log_message" = ''
168
+ then
169
+ log_message=`expr "z$1" : 'z-[^=]*=\(.*\)'`
170
+ else
171
+ log_message="$log_message
172
173
`expr "z$1" : 'zq-[^=]*=\(.*\)'`"
174
- fi
175
- no_edit=t
176
- shift
177
- ;;
178
- -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify)
179
- verify=
180
- shift
181
- ;;
182
- --a|--am|--ame|--amen|--amend)
183
- amend=t
184
- log_given=t$log_given
185
- use_commit=HEAD
186
- shift
187
- ;;
188
- -c)
189
- case "$#" in 1) usage ;; esac
190
- shift
191
- log_given=t$log_given
192
- use_commit="$1"
193
- no_edit=
194
- shift
195
- ;;
196
- --ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
197
- --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
198
- --reedit-messag=*|--reedit-message=*)
199
- log_given=t$log_given
200
- use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
201
- no_edit=
202
- shift
203
- ;;
204
- --ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
205
- --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|--reedit-message)
206
- case "$#" in 1) usage ;; esac
207
- shift
208
- log_given=t$log_given
209
- use_commit="$1"
210
- no_edit=
211
- shift
212
- ;;
213
- -C)
214
- case "$#" in 1) usage ;; esac
215
- shift
216
- log_given=t$log_given
217
- use_commit="$1"
218
- no_edit=t
219
- shift
220
- ;;
221
- --reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
222
- --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
223
- --reuse-message=*)
224
- log_given=t$log_given
225
- use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
226
- no_edit=t
227
- shift
228
- ;;
229
- --reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
230
- --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
231
- case "$#" in 1) usage ;; esac
232
- shift
233
- log_given=t$log_given
234
- use_commit="$1"
235
- no_edit=t
236
- shift
237
- ;;
238
- -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
239
- signoff=t
240
- shift
241
- ;;
242
- -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
243
- verbose=t
244
- shift
245
- ;;
246
- -u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|--untracked|\
247
- --untracked-|--untracked-f|--untracked-fi|--untracked-fil|--untracked-file|\
248
- --untracked-files)
249
- untracked_files=t
250
- shift
251
- ;;
252
- --)
253
- shift
254
- break
255
- ;;
256
- -*)
257
- usage
258
- ;;
259
- *)
260
- break
261
- ;;
262
- esac
174
+ fi
175
+ no_edit=t
176
+ shift
177
+ ;;
178
+ -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|\
179
+ --no-verify)
180
+ verify=
181
+ shift
182
+ ;;
183
+ --a|--am|--ame|--amen|--amend)
184
+ amend=t
185
+ log_given=t$log_given
186
+ use_commit=HEAD
187
+ shift
188
+ ;;
189
+ -c)
190
+ case "$#" in 1) usage ;; esac
191
+ shift
192
+ log_given=t$log_given
193
+ use_commit="$1"
194
+ no_edit=
195
+ shift
196
+ ;;
197
+ --ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
198
+ --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
199
+ --reedit-messag=*|--reedit-message=*)
200
+ log_given=t$log_given
201
+ use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
202
+ no_edit=
203
+ shift
204
+ ;;
205
+ --ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
206
+ --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|\
207
+ --reedit-message)
208
+ case "$#" in 1) usage ;; esac
209
+ shift
210
+ log_given=t$log_given
211
+ use_commit="$1"
212
+ no_edit=
213
+ shift
214
+ ;;
215
+ -C)
216
+ case "$#" in 1) usage ;; esac
217
+ shift
218
+ log_given=t$log_given
219
+ use_commit="$1"
220
+ no_edit=t
221
+ shift
222
+ ;;
223
+ --reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
224
+ --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
225
+ --reuse-message=*)
226
+ log_given=t$log_given
227
+ use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
228
+ no_edit=t
229
+ shift
230
+ ;;
231
+ --reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
232
+ --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
233
+ case "$#" in 1) usage ;; esac
234
+ shift
235
+ log_given=t$log_given
236
+ use_commit="$1"
237
+ no_edit=t
238
+ shift
239
+ ;;
240
+ -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
241
+ signoff=t
242
+ shift
243
+ ;;
244
+ -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
245
+ verbose=t
246
+ shift
247
+ ;;
248
+ -u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|\
249
+ --untracked|--untracked-|--untracked-f|--untracked-fi|--untracked-fil|\
250
+ --untracked-file|--untracked-files)
251
+ untracked_files=t
252
+ shift
253
+ ;;
254
+ --)
255
+ shift
256
+ break
257
+ ;;
258
+ -*)
259
+ usage
260
+ ;;
261
+ *)
262
+ break
263
+ ;;
264
+ esac
265
done
266
case "$edit_flag" in t) no_edit= ;; esac
267
@@ -268,33 +270,33 @@ case "$edit_flag" in t) no_edit= ;; esac
270
271
case "$amend,$initial_commit" in
272
t,t)
271
- die "You do not have anything to amend." ;;
273
+ die "You do not have anything to amend." ;;
274
t,)
273
- if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
274
- die "You are in the middle of a merge -- cannot amend."
275
- fi ;;
275
+ if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
276
+ die "You are in the middle of a merge -- cannot amend."
277
+ fi ;;
278
esac
279
280
case "$log_given" in
281
tt*)
280
- die "Only one of -c/-C/-F can be used." ;;
282
+ die "Only one of -c/-C/-F can be used." ;;
283
*tm*|*mt*)
282
- die "Option -m cannot be combined with -c/-C/-F." ;;
284
+ die "Option -m cannot be combined with -c/-C/-F." ;;
285
esac
286
287
case "$#,$also,$only,$amend" in
288
*,t,t,*)
287
- die "Only one of --include/--only can be used." ;;
289
+ die "Only one of --include/--only can be used." ;;
290
0,t,,* | 0,,t,)
289
- die "No paths with --include/--only does not make sense." ;;
291
+ die "No paths with --include/--only does not make sense." ;;
292
0,,t,t)
291
- only_include_assumed="# Clever... amending the last one with dirty index." ;;
293
+ only_include_assumed="# Clever... amending the last one with dirty index." ;;
294
0,,,*)
293
- ;;
295
+ ;;
296
*,,,*)
295
- only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
296
- also=
297
- ;;
297
+ only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
298
+ also=
299
+ ;;
300
esac
301
unset only
302
case "$all,$also,$#" in
@@ -341,47 +343,47 @@ t,)
343
,)
344
case "$#" in
345
0)
344
- ;; # commit as-is
346
+ ;; # commit as-is
347
*)
346
- if test -f "$GIT_DIR/MERGE_HEAD"
347
- then
348
- refuse_partial "Cannot do a partial commit during a merge."
349
- fi
350
- TMP_INDEX="$GIT_DIR/tmp-index$$"
351
- if test -z "$initial_commit"
352
- then
353
- # make sure index is clean at the specified paths, or
354
- # they are additions.
355
- dirty_in_index=`git-diff-index --cached --name-status \
356
- --diff-filter=DMTU HEAD -- "$@"`
357
- test -z "$dirty_in_index" ||
358
- refuse_partial "Different in index and the last commit:
348
+ if test -f "$GIT_DIR/MERGE_HEAD"
349
+ then
350
+ refuse_partial "Cannot do a partial commit during a merge."
351
+ fi
352
+ TMP_INDEX="$GIT_DIR/tmp-index$$"
353
+ if test -z "$initial_commit"
354
+ then
355
+ # make sure index is clean at the specified paths, or
356
+ # they are additions.
357
+ dirty_in_index=`git-diff-index --cached --name-status \
358
+ --diff-filter=DMTU HEAD -- "$@"`
359
+ test -z "$dirty_in_index" ||
360
+ refuse_partial "Different in index and the last commit:
361
$dirty_in_index"
360
- fi
361
- commit_only=`git-ls-files --error-unmatch -- "$@"` || exit
362
-
363
- # Build the temporary index and update the real index
364
- # the same way.
365
- if test -z "$initial_commit"
366
- then
367
- cp "$THIS_INDEX" "$TMP_INDEX"
368
- GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -m HEAD
369
- else
370
- rm -f "$TMP_INDEX"
371
- fi || exit
372
-
373
- echo "$commit_only" |
374
- GIT_INDEX_FILE="$TMP_INDEX" \
375
- git-update-index --add --remove --stdin &&
376
-
377
- save_index &&
378
- echo "$commit_only" |
379
- (
380
- GIT_INDEX_FILE="$NEXT_INDEX"
381
- export GIT_INDEX_FILE
382
- git-update-index --remove --stdin
383
- ) || exit
384
- ;;
362
+ fi
363
+ commit_only=`git-ls-files --error-unmatch -- "$@"` || exit
364
+
365
+ # Build the temporary index and update the real index
366
+ # the same way.
367
+ if test -z "$initial_commit"
368
+ then
369
+ cp "$THIS_INDEX" "$TMP_INDEX"
370
+ GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -m HEAD
371
+ else
372
+ rm -f "$TMP_INDEX"
373
+ fi || exit
374
+
375
+ echo "$commit_only" |
376
+ GIT_INDEX_FILE="$TMP_INDEX" \
377
+ git-update-index --add --remove --stdin &&
378
+
379
+ save_index &&
380
+ echo "$commit_only" |
381
+ (
382
+ GIT_INDEX_FILE="$NEXT_INDEX"
383
+ export GIT_INDEX_FILE
384
+ git-update-index --remove --stdin
385
+ ) || exit
386
+ ;;
387
esac
388
;;
389
esac
@@ -399,7 +401,7 @@ else
401
fi
402
403
GIT_INDEX_FILE="$USE_INDEX" \
402
- git-update-index -q $unmerged_ok_if_status --refresh || exit
404
+ git-update-index -q $unmerged_ok_if_status --refresh || exit
405
406
################################################################
407
# If the request is status, just show it and exit.