{"thread":{"id":"5848","subject":"[PATCH] git-commit: fix coding style.","startedAt":"2006-10-07T19:07:40Z","lastAt":"2006-10-07T19:07:40Z","messageCount":1,"participants":["Martin Waitz"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"28382","messageId":"20061007190740.GY2871@admingilde.org","threadId":"5848","inReplyTo":null,"subject":"[PATCH] git-commit: fix coding style.","fromName":"Martin Waitz","fromEmail":"tali@admingilde.org","sentAt":"2006-10-07T19:07:40Z","receivedAt":"2006-10-07T19:07:40Z","isPatch":true,"sender":{"key":"tali@admingilde.org","avatar":"https://gravatar.com/avatar/3f89b03eee362187effabe257898735b475673a12265c398ea9161259ae91553?d=mp&s=160"},"body":"git-commit.sh was using a mixture of spaces and tabs for indentation.\nThis is changed to one tab per indentation level.\nNo code changes.\n\nSigned-off-by: Martin Waitz <tali@admingilde.org>\n---\n git-commit.sh |  464 +++++++++++++++++++++++++++++----------------------------\n 1 files changed, 233 insertions(+), 231 deletions(-)\n\ndiff --git a/git-commit.sh b/git-commit.sh\nindex 6f6cbda..5b1cf85 100755\n--- a/git-commit.sh\n+++ b/git-commit.sh\n@@ -41,21 +41,21 @@ run_status () {\n \t# so the regular index file is what we use to compare.\n \tif test '' != \"$TMP_INDEX\"\n \tthen\n-\t    GIT_INDEX_FILE=\"$TMP_INDEX\"\n-\t    export GIT_INDEX_FILE\n+\t\tGIT_INDEX_FILE=\"$TMP_INDEX\"\n+\t\texport GIT_INDEX_FILE\n \telif test -f \"$NEXT_INDEX\"\n \tthen\n-\t    GIT_INDEX_FILE=\"$NEXT_INDEX\"\n-\t    export GIT_INDEX_FILE\n+\t\tGIT_INDEX_FILE=\"$NEXT_INDEX\"\n+\t\texport GIT_INDEX_FILE\n \tfi\n \n-  case \"$status_only\" in\n-    t) color= ;;\n-    *) color=--nocolor ;;\n-  esac\n-  git-runstatus ${color} \\\n-                ${verbose:+--verbose} \\\n-                ${amend:+--amend} \\\n+\tcase \"$status_only\" in\n+\tt) color= ;;\n+\t*) color=--nocolor ;;\n+\tesac\n+\tgit-runstatus ${color} \\\n+\t\t${verbose:+--verbose} \\\n+\t\t${amend:+--amend} \\\n \t\t${untracked_files:+--untracked}\n }\n \n@@ -87,179 +87,181 @@ only_include_assumed=\n untracked_files=\n while case \"$#\" in 0) break;; esac\n do\n-  case \"$1\" in\n-  -F|--F|-f|--f|--fi|--fil|--file)\n-      case \"$#\" in 1) usage ;; esac\n-      shift\n-      no_edit=t\n-      log_given=t$log_given\n-      logfile=\"$1\"\n-      shift\n-      ;;\n-  -F*|-f*)\n-      no_edit=t\n-      log_given=t$log_given\n-      logfile=`expr \"z$1\" : 'z-[Ff]\\(.*\\)'`\n-      shift\n-      ;;\n-  --F=*|--f=*|--fi=*|--fil=*|--file=*)\n-      no_edit=t\n-      log_given=t$log_given\n-      logfile=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n-      shift\n-      ;;\n-  -a|--a|--al|--all)\n-      all=t\n-      shift\n-      ;;\n-  --au=*|--aut=*|--auth=*|--autho=*|--author=*)\n-      force_author=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n-      shift\n-      ;;\n-  --au|--aut|--auth|--autho|--author)\n-      case \"$#\" in 1) usage ;; esac\n-      shift\n-      force_author=\"$1\"\n-      shift\n-      ;;\n-  -e|--e|--ed|--edi|--edit)\n-      edit_flag=t\n-      shift\n-      ;;\n-  -i|--i|--in|--inc|--incl|--inclu|--includ|--include)\n-      also=t\n-      shift\n-      ;;\n-  -o|--o|--on|--onl|--only)\n-      only=t\n-      shift\n-      ;;\n-  -m|--m|--me|--mes|--mess|--messa|--messag|--message)\n-      case \"$#\" in 1) usage ;; esac\n-      shift\n-      log_given=m$log_given\n-      if test \"$log_message\" = ''\n-      then\n-          log_message=\"$1\"\n-      else\n-          log_message=\"$log_message\n+\tcase \"$1\" in\n+\t-F|--F|-f|--f|--fi|--fil|--file)\n+\t\tcase \"$#\" in 1) usage ;; esac\n+\t\tshift\n+\t\tno_edit=t\n+\t\tlog_given=t$log_given\n+\t\tlogfile=\"$1\"\n+\t\tshift\n+\t\t;;\n+\t-F*|-f*)\n+\t\tno_edit=t\n+\t\tlog_given=t$log_given\n+\t\tlogfile=`expr \"z$1\" : 'z-[Ff]\\(.*\\)'`\n+\t\tshift\n+\t\t;;\n+\t--F=*|--f=*|--fi=*|--fil=*|--file=*)\n+\t\tno_edit=t\n+\t\tlog_given=t$log_given\n+\t\tlogfile=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n+\t\tshift\n+\t\t;;\n+\t-a|--a|--al|--all)\n+\t\tall=t\n+\t\tshift\n+\t\t;;\n+\t--au=*|--aut=*|--auth=*|--autho=*|--author=*)\n+\t\tforce_author=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n+\t\tshift\n+\t\t;;\n+\t--au|--aut|--auth|--autho|--author)\n+\t\tcase \"$#\" in 1) usage ;; esac\n+\t\tshift\n+\t\tforce_author=\"$1\"\n+\t\tshift\n+\t\t;;\n+\t-e|--e|--ed|--edi|--edit)\n+\t\tedit_flag=t\n+\t\tshift\n+\t\t;;\n+\t-i|--i|--in|--inc|--incl|--inclu|--includ|--include)\n+\t\talso=t\n+\t\tshift\n+\t\t;;\n+\t-o|--o|--on|--onl|--only)\n+\t\tonly=t\n+\t\tshift\n+\t\t;;\n+\t-m|--m|--me|--mes|--mess|--messa|--messag|--message)\n+\t\tcase \"$#\" in 1) usage ;; esac\n+\t\tshift\n+\t\tlog_given=m$log_given\n+\t\tif test \"$log_message\" = ''\n+\t\tthen\n+\t\t    log_message=\"$1\"\n+\t\telse\n+\t\t    log_message=\"$log_message\n \n $1\"\n-      fi\n-      no_edit=t\n-      shift\n-      ;;\n-  -m*)\n-      log_given=m$log_given\n-      if test \"$log_message\" = ''\n-      then\n-          log_message=`expr \"z$1\" : 'z-m\\(.*\\)'`\n-      else\n-          log_message=\"$log_message\n+\t\tfi\n+\t\tno_edit=t\n+\t\tshift\n+\t\t;;\n+\t-m*)\n+\t\tlog_given=m$log_given\n+\t\tif test \"$log_message\" = ''\n+\t\tthen\n+\t\t    log_message=`expr \"z$1\" : 'z-m\\(.*\\)'`\n+\t\telse\n+\t\t    log_message=\"$log_message\n \n `expr \"z$1\" : 'z-m\\(.*\\)'`\"\n-      fi\n-      no_edit=t\n-      shift\n-      ;;\n-  --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)\n-      log_given=m$log_given\n-      if test \"$log_message\" = ''\n-      then\n-          log_message=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n-      else\n-          log_message=\"$log_message\n+\t\tfi\n+\t\tno_edit=t\n+\t\tshift\n+\t\t;;\n+\t--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)\n+\t\tlog_given=m$log_given\n+\t\tif test \"$log_message\" = ''\n+\t\tthen\n+\t\t    log_message=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n+\t\telse\n+\t\t    log_message=\"$log_message\n \n `expr \"z$1\" : 'zq-[^=]*=\\(.*\\)'`\"\n-      fi\n-      no_edit=t\n-      shift\n-      ;;\n-  -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify)\n-      verify=\n-      shift\n-      ;;\n-  --a|--am|--ame|--amen|--amend)\n-      amend=t\n-      log_given=t$log_given\n-      use_commit=HEAD\n-      shift\n-      ;;\n-  -c)\n-      case \"$#\" in 1) usage ;; esac\n-      shift\n-      log_given=t$log_given\n-      use_commit=\"$1\"\n-      no_edit=\n-      shift\n-      ;;\n-  --ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\\\n-  --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\\\n-  --reedit-messag=*|--reedit-message=*)\n-      log_given=t$log_given\n-      use_commit=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n-      no_edit=\n-      shift\n-      ;;\n-  --ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\\\n-  --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|--reedit-message)\n-      case \"$#\" in 1) usage ;; esac\n-      shift\n-      log_given=t$log_given\n-      use_commit=\"$1\"\n-      no_edit=\n-      shift\n-      ;;\n-  -C)\n-      case \"$#\" in 1) usage ;; esac\n-      shift\n-      log_given=t$log_given\n-      use_commit=\"$1\"\n-      no_edit=t\n-      shift\n-      ;;\n-  --reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\\\n-  --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\\\n-  --reuse-message=*)\n-      log_given=t$log_given\n-      use_commit=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n-      no_edit=t\n-      shift\n-      ;;\n-  --reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\\\n-  --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)\n-      case \"$#\" in 1) usage ;; esac\n-      shift\n-      log_given=t$log_given\n-      use_commit=\"$1\"\n-      no_edit=t\n-      shift\n-      ;;\n-  -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)\n-      signoff=t\n-      shift\n-      ;;\n-  -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)\n-      verbose=t\n-      shift\n-      ;;\n-  -u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|--untracked|\\\n-  --untracked-|--untracked-f|--untracked-fi|--untracked-fil|--untracked-file|\\\n-  --untracked-files)\n-      untracked_files=t\n-      shift\n-      ;;\n-  --)\n-      shift\n-      break\n-      ;;\n-  -*)\n-      usage\n-      ;;\n-  *)\n-      break\n-      ;;\n-  esac\n+\t\tfi\n+\t\tno_edit=t\n+\t\tshift\n+\t\t;;\n+\t-n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|\\\n+\t--no-verify)\n+\t\tverify=\n+\t\tshift\n+\t\t;;\n+\t--a|--am|--ame|--amen|--amend)\n+\t\tamend=t\n+\t\tlog_given=t$log_given\n+\t\tuse_commit=HEAD\n+\t\tshift\n+\t\t;;\n+\t-c)\n+\t\tcase \"$#\" in 1) usage ;; esac\n+\t\tshift\n+\t\tlog_given=t$log_given\n+\t\tuse_commit=\"$1\"\n+\t\tno_edit=\n+\t\tshift\n+\t\t;;\n+\t--ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\\\n+\t--reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\\\n+\t--reedit-messag=*|--reedit-message=*)\n+\t\tlog_given=t$log_given\n+\t\tuse_commit=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n+\t\tno_edit=\n+\t\tshift\n+\t\t;;\n+\t--ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\\\n+\t--reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|\\\n+\t--reedit-message)\n+\t\tcase \"$#\" in 1) usage ;; esac\n+\t\tshift\n+\t\tlog_given=t$log_given\n+\t\tuse_commit=\"$1\"\n+\t\tno_edit=\n+\t\tshift\n+\t\t;;\n+\t-C)\n+\t\tcase \"$#\" in 1) usage ;; esac\n+\t\tshift\n+\t\tlog_given=t$log_given\n+\t\tuse_commit=\"$1\"\n+\t\tno_edit=t\n+\t\tshift\n+\t\t;;\n+\t--reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\\\n+\t--reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\\\n+\t--reuse-message=*)\n+\t\tlog_given=t$log_given\n+\t\tuse_commit=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`\n+\t\tno_edit=t\n+\t\tshift\n+\t\t;;\n+\t--reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\\\n+\t--reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)\n+\t\tcase \"$#\" in 1) usage ;; esac\n+\t\tshift\n+\t\tlog_given=t$log_given\n+\t\tuse_commit=\"$1\"\n+\t\tno_edit=t\n+\t\tshift\n+\t\t;;\n+\t-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)\n+\t\tsignoff=t\n+\t\tshift\n+\t\t;;\n+\t-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)\n+\t\tverbose=t\n+\t\tshift\n+\t\t;;\n+\t-u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|\\\n+\t--untracked|--untracked-|--untracked-f|--untracked-fi|--untracked-fil|\\\n+\t--untracked-file|--untracked-files)\n+\t\tuntracked_files=t\n+\t\tshift\n+\t\t;;\n+\t--)\n+\t\tshift\n+\t\tbreak\n+\t\t;;\n+\t-*)\n+\t\tusage\n+\t\t;;\n+\t*)\n+\t\tbreak\n+\t\t;;\n+\tesac\n done\n case \"$edit_flag\" in t) no_edit= ;; esac\n \n@@ -268,33 +270,33 @@ # Sanity check options\n \n case \"$amend,$initial_commit\" in\n t,t)\n-  die \"You do not have anything to amend.\" ;;\n+\tdie \"You do not have anything to amend.\" ;;\n t,)\n-  if [ -f \"$GIT_DIR/MERGE_HEAD\" ]; then\n-    die \"You are in the middle of a merge -- cannot amend.\"\n-  fi ;;\n+\tif [ -f \"$GIT_DIR/MERGE_HEAD\" ]; then\n+\t\tdie \"You are in the middle of a merge -- cannot amend.\"\n+\tfi ;;\n esac\n \n case \"$log_given\" in\n tt*)\n-  die \"Only one of -c/-C/-F can be used.\" ;;\n+\tdie \"Only one of -c/-C/-F can be used.\" ;;\n *tm*|*mt*)\n-  die \"Option -m cannot be combined with -c/-C/-F.\" ;;\n+\tdie \"Option -m cannot be combined with -c/-C/-F.\" ;;\n esac\n \n case \"$#,$also,$only,$amend\" in\n *,t,t,*)\n-  die \"Only one of --include/--only can be used.\" ;;\n+\tdie \"Only one of --include/--only can be used.\" ;;\n 0,t,,* | 0,,t,)\n-  die \"No paths with --include/--only does not make sense.\" ;;\n+\tdie \"No paths with --include/--only does not make sense.\" ;;\n 0,,t,t)\n-  only_include_assumed=\"# Clever... amending the last one with dirty index.\" ;;\n+\tonly_include_assumed=\"# Clever... amending the last one with dirty index.\" ;;\n 0,,,*)\n-  ;;\n+\t;;\n *,,,*)\n-  only_include_assumed=\"# Explicit paths specified without -i nor -o; assuming --only paths...\"\n-  also=\n-  ;;\n+\tonly_include_assumed=\"# Explicit paths specified without -i nor -o; assuming --only paths...\"\n+\talso=\n+\t;;\n esac\n unset only\n case \"$all,$also,$#\" in\n@@ -341,47 +343,47 @@ t,)\n ,)\n \tcase \"$#\" in\n \t0)\n-\t    ;; # commit as-is\n+\t\t;; # commit as-is\n \t*)\n-\t    if test -f \"$GIT_DIR/MERGE_HEAD\"\n-\t    then\n-\t\trefuse_partial \"Cannot do a partial commit during a merge.\"\n-\t    fi\n-\t    TMP_INDEX=\"$GIT_DIR/tmp-index$$\"\n-\t    if test -z \"$initial_commit\"\n-\t    then\n-\t\t# make sure index is clean at the specified paths, or\n-\t\t# they are additions.\n-\t\tdirty_in_index=`git-diff-index --cached --name-status \\\n-\t\t\t--diff-filter=DMTU HEAD -- \"$@\"`\n-\t\ttest -z \"$dirty_in_index\" ||\n-\t\trefuse_partial \"Different in index and the last commit:\n+\t\tif test -f \"$GIT_DIR/MERGE_HEAD\"\n+\t\tthen\n+\t\t\trefuse_partial \"Cannot do a partial commit during a merge.\"\n+\t\tfi\n+\t\tTMP_INDEX=\"$GIT_DIR/tmp-index$$\"\n+\t\tif test -z \"$initial_commit\"\n+\t\tthen\n+\t\t\t# make sure index is clean at the specified paths, or\n+\t\t\t# they are additions.\n+\t\t\tdirty_in_index=`git-diff-index --cached --name-status \\\n+\t\t\t\t--diff-filter=DMTU HEAD -- \"$@\"`\n+\t\t\ttest -z \"$dirty_in_index\" ||\n+\t\t\trefuse_partial \"Different in index and the last commit:\n $dirty_in_index\"\n-\t    fi\n-\t    commit_only=`git-ls-files --error-unmatch -- \"$@\"` || exit\n-\n-\t    # Build the temporary index and update the real index\n-\t    # the same way.\n-\t    if test -z \"$initial_commit\"\n-\t    then\n-\t\tcp \"$THIS_INDEX\" \"$TMP_INDEX\"\n-\t\tGIT_INDEX_FILE=\"$TMP_INDEX\" git-read-tree -m HEAD\n-\t    else\n-\t\t    rm -f \"$TMP_INDEX\"\n-\t    fi || exit\n-\n-\t    echo \"$commit_only\" |\n-\t    GIT_INDEX_FILE=\"$TMP_INDEX\" \\\n-\t    git-update-index --add --remove --stdin &&\n-\n-\t    save_index &&\n-\t    echo \"$commit_only\" |\n-\t    (\n-\t\tGIT_INDEX_FILE=\"$NEXT_INDEX\"\n-\t\texport GIT_INDEX_FILE\n-\t\tgit-update-index --remove --stdin\n-\t    ) || exit\n-\t    ;;\n+\t\tfi\n+\t\tcommit_only=`git-ls-files --error-unmatch -- \"$@\"` || exit\n+\n+\t\t# Build the temporary index and update the real index\n+\t\t# the same way.\n+\t\tif test -z \"$initial_commit\"\n+\t\tthen\n+\t\t\tcp \"$THIS_INDEX\" \"$TMP_INDEX\"\n+\t\t\tGIT_INDEX_FILE=\"$TMP_INDEX\" git-read-tree -m HEAD\n+\t\telse\n+\t\t\trm -f \"$TMP_INDEX\"\n+\t\tfi || exit\n+\n+\t\techo \"$commit_only\" |\n+\t\tGIT_INDEX_FILE=\"$TMP_INDEX\" \\\n+\t\tgit-update-index --add --remove --stdin &&\n+\n+\t\tsave_index &&\n+\t\techo \"$commit_only\" |\n+\t\t(\n+\t\t\tGIT_INDEX_FILE=\"$NEXT_INDEX\"\n+\t\t\texport GIT_INDEX_FILE\n+\t\t\tgit-update-index --remove --stdin\n+\t\t) || exit\n+\t\t;;\n \tesac\n \t;;\n esac\n@@ -399,7 +401,7 @@ else\n fi\n \n GIT_INDEX_FILE=\"$USE_INDEX\" \\\n-    git-update-index -q $unmerged_ok_if_status --refresh || exit\n+\tgit-update-index -q $unmerged_ok_if_status --refresh || exit\n \n ################################################################\n # If the request is status, just show it and exit.\n-- \n1.4.2.3\n\n-- \nMartin Waitz\n"}]}