diff --git a/builtin/log.c b/builtin/log.c
index 046f3e4ada..5f3a7d6b91 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -110,10 +110,11 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
 	}
 
 	/*
-	 * defeat log.decorate configuration interacting with --pretty
+	 * defeat log.decorate configuration interacting with --pretty=raw
 	 * from the command line.
 	 */
-	if (!decoration_given && rev->pretty_given)
+	if (!decoration_given && rev->pretty_given
+	    && rev->commit_format == CMIT_FMT_RAW)
 		decoration_style = 0;
 
 	if (decoration_style) {
diff --git a/git-stash.sh b/git-stash.sh
index 59db3dc38e..908aab2659 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -57,7 +57,7 @@ create_stash () {
 	# state of the base commit
 	if b_commit=$(git rev-parse --verify HEAD)
 	then
-		head=$(git log --no-color --abbrev-commit --pretty=oneline -n 1 HEAD --)
+		head=$(git rev-list --oneline -n 1 HEAD --)
 	else
 		die "You do not have the initial commit yet"
 	fi
diff --git a/git-submodule.sh b/git-submodule.sh
index 2dd372a21d..187461cb3e 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -648,7 +648,7 @@ cmd_summary() {
 				range=$sha1_dst
 			fi
 			GIT_DIR="$name/.git" \
-			git log --pretty=oneline --first-parent $range | wc -l
+			git rev-list --first-parent $range -- | wc -l
 			)
 			total_commits=" ($(($total_commits + 0)))"
 			;;
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 166de4479c..2230e606ed 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -390,62 +390,50 @@ test_expect_success 'log --graph with merge' '
 test_expect_success 'log.decorate configuration' '
 	git config --unset-all log.decorate || :
 
-	git log >expect.none &&
-	git log --decorate >expect.short &&
-	git log --decorate=full >expect.full &&
-	git log --oneline >expect.oneline &&
+	git log --oneline >expect.none &&
+	git log --oneline --decorate >expect.short &&
+	git log --oneline --decorate=full >expect.full &&
 
 	echo "[log] decorate" >>.git/config &&
-	git log >actual &&
-	test_cmp expect.short actual &&
 	git log --oneline >actual &&
-	test_cmp expect.oneline actual &&
+	test_cmp expect.short actual &&
 
 	git config --unset-all log.decorate &&
 	git config log.decorate true &&
-	git log >actual &&
-	test_cmp expect.short actual &&
-	git log --decorate=full >actual &&
-	test_cmp expect.full actual &&
-	git log --decorate=no >actual &&
-	test_cmp expect.none actual &&
 	git log --oneline >actual &&
-	test_cmp expect.oneline actual &&
+	test_cmp expect.short actual &&
+	git log --oneline --decorate=full >actual &&
+	test_cmp expect.full actual &&
+	git log --oneline --decorate=no >actual &&
+	test_cmp expect.none actual &&
 
 	git config --unset-all log.decorate &&
 	git config log.decorate no &&
-	git log >actual &&
-	test_cmp expect.none actual &&
-	git log --decorate >actual &&
-	test_cmp expect.short actual &&
-	git log --decorate=full >actual &&
-	test_cmp expect.full actual &&
 	git log --oneline >actual &&
-	test_cmp expect.oneline actual &&
+	test_cmp expect.none actual &&
+	git log --oneline --decorate >actual &&
+	test_cmp expect.short actual &&
+	git log --oneline --decorate=full >actual &&
+	test_cmp expect.full actual &&
 
 	git config --unset-all log.decorate &&
 	git config log.decorate short &&
-	git log >actual &&
-	test_cmp expect.short actual &&
-	git log --no-decorate >actual &&
-	test_cmp expect.none actual &&
-	git log --decorate=full >actual &&
-	test_cmp expect.full actual &&
 	git log --oneline >actual &&
-	test_cmp expect.oneline actual &&
+	test_cmp expect.short actual &&
+	git log --oneline --no-decorate >actual &&
+	test_cmp expect.none actual &&
+	git log --oneline --decorate=full >actual &&
+	test_cmp expect.full actual &&
 
 	git config --unset-all log.decorate &&
 	git config log.decorate full &&
-	git log >actual &&
-	test_cmp expect.full actual &&
-	git log --no-decorate >actual &&
-	test_cmp expect.none actual &&
-	git log --decorate >actual &&
-	test_cmp expect.short actual
 	git log --oneline >actual &&
-	test_cmp expect.oneline actual &&
+	test_cmp expect.full actual &&
+	git log --oneline --no-decorate >actual &&
+	test_cmp expect.none actual &&
+	git log --oneline --decorate >actual &&
+	test_cmp expect.short actual
 
-	:
 '
 
 test_done