freshlybakedca.ke
Git fork
Merge branch 'maint-1.7.5' into maint
* maint-1.7.5:
test: skip clean-up when running under --immediate mode
"branch -d" can remove more than one branches
+11
-3
+1
-1
builtin/branch.c
+1
-1
builtin/branch.c
···
19
19
static const char * const builtin_branch_usage[] = {
20
20
"git branch [options] [-r | -a] [--merged | --no-merged]",
21
21
"git branch [options] [-l] [-f] <branchname> [<start-point>]",
22
-
"git branch [options] [-r] (-d | -D) <branchname>",
22
+
"git branch [options] [-r] (-d | -D) <branchname>...",
23
23
"git branch [options] (-m | -M) [<oldbranch>] <newbranch>",
24
24
NULL
25
25
};
+10
-2
t/test-lib.sh
+10
-2
t/test-lib.sh
···
446
446
447
447
test_run_ () {
448
448
test_cleanup=:
449
+
expecting_failure=$2
449
450
eval >&3 2>&4 "$1"
450
451
eval_ret=$?
451
-
eval >&3 2>&4 "$test_cleanup"
452
+
453
+
if test -z "$immediate" || test $eval_ret = 0 || test -n "$expecting_failure"
454
+
then
455
+
eval >&3 2>&4 "$test_cleanup"
456
+
fi
452
457
if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE"; then
453
458
echo ""
454
459
fi
···
497
502
if ! test_skip "$@"
498
503
then
499
504
say >&3 "checking known breakage: $2"
500
-
test_run_ "$2"
505
+
test_run_ "$2" expecting_failure
501
506
if [ "$?" = 0 -a "$eval_ret" = 0 ]
502
507
then
503
508
test_known_broken_ok_ "$1"
···
774
779
#
775
780
# except that the greeting and config --unset must both succeed for
776
781
# the test to pass.
782
+
#
783
+
# Note that under --immediate mode, no clean-up is done to help diagnose
784
+
# what went wrong.
777
785
778
786
test_when_finished () {
779
787
test_cleanup="{ $*