Re: [PATCH 3/6] rebase: trivial style fixes
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:58:35
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH 3/6] rebase: trivial style fixes · Felipe Contreras <hidden>
Felipe Contreras [off-list ref] writes:
quoted hunk
Signed-off-by: Felipe Contreras <redacted> --- git-rebase.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)diff --git a/git-rebase.sh b/git-rebase.sh index 8d7659a..2c02853 100755 --- a/git-rebase.sh +++ b/git-rebase.sh@@ -324,7 +324,7 @@ done test $# -gt 2 && usage if test -n "$cmd" && - test "$interactive_rebase" != explicit + test "$interactive_rebase" != explicit then die "$(gettext "The --exec option must be used with the --interactive option")" fi@@ -486,7 +486,7 @@ case "$#" in switch_to="$1" if git show-ref --verify --quiet -- "refs/heads/$1" && - orig_head=$(git rev-parse -q --verify "refs/heads/$1") + orig_head=$(git rev-parse -q --verify "refs/heads/$1") then head_name="refs/heads/$1" elif orig_head=$(git rev-parse -q --verify "$1")
I am not sure about this change. I do not personally have strong preference on this, but it would be better to be consistent. The style of the original we see above seems to be the one that is consistently used in this file for conditionals that span multiple lines. That is, to align the beginning of subsequent lines with the beginning of the conditional (i.e. the "g" in "git show-ref" on the first line)---which happens to be in line with what we use in our C sources, too. I see there is one oddball in that file, though. git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 8d7659a..187793e 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -422,7 +422,7 @@ then case "$#" in 0) if ! upstream_name=$(git rev-parse --symbolic-full-name \ - --verify -q @{upstream} 2>/dev/null) + --verify -q @{upstream} 2>/dev/null) then . git-parse-remote error_on_missing_default_upstream "rebase" "rebase" \