{"thread":{"id":"8235","subject":"[PATCH 1/6] Remove whitespace breakage from *.c files","startedAt":"2007-05-20T10:25:49Z","lastAt":"2007-05-21T16:39:34Z","messageCount":4,"participants":["Marco Costalba","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"42688","messageId":"4650222D.4070707@gmail.com","threadId":"8235","inReplyTo":null,"subject":"[PATCH 1/6] Remove whitespace breakage from *.c files","fromName":"Marco Costalba","fromEmail":"mcostalba@gmail.com","sentAt":"2007-05-20T10:25:49Z","receivedAt":"2007-05-20T10:25:49Z","isPatch":true,"sender":{"key":"mcostalba@gmail.com","avatar":null},"body":"This patch removes whitespace found with the following\ncommands, as suggested by Junio. Suggestion to do not consider\nalso Documentation/ directory is from Johannes.\n\n$ git checkout master\n$ rm -f .git/index\n$ git checkout HEAD -- t/ Documentation/\n$ git clean -x -d\n$ git diff -R --binary HEAD >P.diff\n$ git apply --index --whitespace=strip P.diff\n\n'git apply' has been modified to trim empty lines at the end of file.\n\nThis patch applies to *.c files only\n\nSigned-off-by: Marco Costalba <mcostalba@gmail.com>\n---\n  arm/sha1.c              |    4 ++--\n  builtin-annotate.c      |    1 -\n  builtin-diff-index.c    |    2 +-\n  builtin-fmt-merge-msg.c |    1 -\n  builtin-fsck.c          |    4 ++--\n  builtin-ls-files.c      |    2 +-\n  builtin-name-rev.c      |    1 -\n  builtin-pack-objects.c  |    2 +-\n  builtin-rerere.c        |    1 -\n  builtin-shortlog.c      |    1 -\n  commit.c                |   14 +++++++-------\n  compat/mmap.c           |    1 -\n  config.c                |    3 +--\n  connect.c               |    2 +-\n  convert-objects.c       |    2 +-\n  copy.c                  |    1 -\n  ctype.c                 |    1 -\n  daemon.c                |    4 ++--\n  date.c                  |   10 +++++-----\n  diff-lib.c              |    2 +-\n  diff.c                  |    4 ++--\n  diffcore-pickaxe.c      |    2 +-\n  entry.c                 |    2 +-\n  environment.c           |    2 --\n  fetch-pack.c            |    2 +-\n  fetch.c                 |    4 ++--\n  help.c                  |    2 --\n  http-fetch.c            |    2 +-\n  http-push.c             |    2 +-\n  http.c                  |    2 +-\n  imap-send.c             |    2 +-\n  local-fetch.c           |    8 ++++----\n  lockfile.c              |    1 -\n  mailmap.c               |    1 -\n  match-trees.c           |    1 -\n  merge-index.c           |    2 +-\n  mktag.c                 |    2 +-\n  mozilla-sha1/sha1.c     |   19 +++++++++----------\n  object-refs.c           |    2 --\n  pack-redundant.c        |    4 ++--\n  patch-id.c              |    2 +-\n  path-list.c             |    1 -\n  pkt-line.c              |    2 +-\n  ppc/sha1.c              |    2 +-\n  read-cache.c            |   10 +++++-----\n  setup.c                 |    4 ++--\n  sha1_file.c             |    8 ++++----\n  shallow.c               |    1 -\n  ssh-upload.c            |   10 +++++-----\n  strbuf.c                |    1 -\n  tree-walk.c             |    1 -\n  upload-pack.c           |    2 +-\n  var.c                   |    4 ++--\n  xdiff-interface.c       |    2 --\n  xdiff/xdiffi.c          |    1 -\n  xdiff/xemit.c           |    1 -\n  xdiff/xprepare.c        |    1 -\n  xdiff/xutils.c          |    1 -\n  58 files changed, 75 insertions(+), 104 deletions(-)\n\ndiff --git a/arm/sha1.c b/arm/sha1.c\nindex 11b1a04..9e3ae03 100644\n--- a/arm/sha1.c\n+++ b/arm/sha1.c\n@@ -49,7 +49,7 @@ void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n)\n  void SHA1_Final(unsigned char *hash, SHA_CTX *c)\n  {\n  \tuint64_t bitlen;\n-\tuint32_t bitlen_hi, bitlen_lo;\n+\tuint32_t bitlen_hi, bitlen_lo;\n  \tunsigned int i, offset, padlen;\n  \tunsigned char bits[8];\n  \tstatic const unsigned char padding[64] = { 0x80, };\n@@ -69,7 +69,7 @@ void SHA1_Final(unsigned char *hash, SHA_CTX *c)\n  \tbits[5] = bitlen_lo >> 16;\n  \tbits[6] = bitlen_lo >> 8;\n  \tbits[7] = bitlen_lo;\n-\tSHA1_Update(c, bits, 8);\n+\tSHA1_Update(c, bits, 8);\n\n  \tfor (i = 0; i < 5; i++) {\n  \t\tuint32_t v = c->hash[i];\ndiff --git a/builtin-annotate.c b/builtin-annotate.c\nindex 9db7cfe..fc43eed 100644\n--- a/builtin-annotate.c\n+++ b/builtin-annotate.c\n@@ -22,4 +22,3 @@ int cmd_annotate(int argc, const char **argv, const char *prefix)\n\n  \treturn cmd_blame(argc + 1, nargv, prefix);\n  }\n-\ndiff --git a/builtin-diff-index.c b/builtin-diff-index.c\nindex d90eba9..81e7167 100644\n--- a/builtin-diff-index.c\n+++ b/builtin-diff-index.c\n@@ -23,7 +23,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)\n  \targc = setup_revisions(argc, argv, &rev, NULL);\n  \tfor (i = 1; i < argc; i++) {\n  \t\tconst char *arg = argv[i];\n-\t\t\t\n+\n  \t\tif (!strcmp(arg, \"--cached\"))\n  \t\t\tcached = 1;\n  \t\telse\ndiff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\nindex 5c145d2..ae60fcc 100644\n--- a/builtin-fmt-merge-msg.c\n+++ b/builtin-fmt-merge-msg.c\n@@ -357,4 +357,3 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n\n  \treturn 0;\n  }\n-\ndiff --git a/builtin-fsck.c b/builtin-fsck.c\nindex 44ce629..3c7e30d 100644\n--- a/builtin-fsck.c\n+++ b/builtin-fsck.c\n@@ -336,7 +336,7 @@ static int fsck_commit(struct commit *commit)\n  \tif (!commit->parents && show_root)\n  \t\tprintf(\"root %s\\n\", sha1_to_hex(commit->object.sha1));\n  \tif (!commit->date)\n-\t\tprintf(\"bad commit date in %s\\n\",\n+\t\tprintf(\"bad commit date in %s\\n\",\n  \t\t       sha1_to_hex(commit->object.sha1));\n  \treturn 0;\n  }\n@@ -676,7 +676,7 @@ int cmd_fsck(int argc, char **argv, const char *prefix)\n\n  \theads = 0;\n  \tfor (i = 1; i < argc; i++) {\n-\t\tconst char *arg = argv[i];\n+\t\tconst char *arg = argv[i];\n\n  \t\tif (*arg == '-')\n  \t\t\tcontinue;\ndiff --git a/builtin-ls-files.c b/builtin-ls-files.c\nindex f7c066b..5398a41 100644\n--- a/builtin-ls-files.c\n+++ b/builtin-ls-files.c\n@@ -117,7 +117,7 @@ static void show_other_files(struct dir_struct *dir)\n  \t\tif (0 <= pos)\n  \t\t\tcontinue;\t/* exact match */\n  \t\tpos = -pos - 1;\n-\t\tif (pos < active_nr) {\n+\t\tif (pos < active_nr) {\n  \t\t\tce = active_cache[pos];\n  \t\t\tif (ce_namelen(ce) == len &&\n  \t\t\t    !memcmp(ce->name, ent->name, len))\ndiff --git a/builtin-name-rev.c b/builtin-name-rev.c\nindex ef16385..59e6a83 100644\n--- a/builtin-name-rev.c\n+++ b/builtin-name-rev.c\n@@ -275,4 +275,3 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)\n\n  \treturn 0;\n  }\n-\ndiff --git a/builtin-pack-objects.c b/builtin-pack-objects.c\nindex 966f843..3ba1f09 100644\n--- a/builtin-pack-objects.c\n+++ b/builtin-pack-objects.c\n@@ -242,7 +242,7 @@ static void *delta_against(void *buf, unsigned long size, struct object_entry *e\n          delta_buf = diff_delta(otherbuf, othersize,\n  \t\t\t       buf, size, &delta_size, 0);\n          if (!delta_buf || delta_size != entry->delta_size)\n-        \tdie(\"delta size changed\");\n+\t\tdie(\"delta size changed\");\n          free(buf);\n          free(otherbuf);\n  \treturn delta_buf;\ndiff --git a/builtin-rerere.c b/builtin-rerere.c\nindex 8c2c8bd..f6409b9 100644\n--- a/builtin-rerere.c\n+++ b/builtin-rerere.c\n@@ -434,4 +434,3 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)\n  \tpath_list_clear(&merge_rr, 1);\n  \treturn 0;\n  }\n-\ndiff --git a/builtin-shortlog.c b/builtin-shortlog.c\nindex 8d3f742..16af619 100644\n--- a/builtin-shortlog.c\n+++ b/builtin-shortlog.c\n@@ -331,4 +331,3 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)\n\n  \treturn 0;\n  }\n-\ndiff --git a/commit.c b/commit.c\nindex bee066f..6993663 100644\n--- a/commit.c\n+++ b/commit.c\n@@ -148,7 +148,7 @@ static int commit_graft_pos(const unsigned char *sha1)\n  int register_commit_graft(struct commit_graft *graft, int ignore_dups)\n  {\n  \tint pos = commit_graft_pos(graft->sha1);\n-\t\n+\n  \tif (0 <= pos) {\n  \t\tif (ignore_dups)\n  \t\t\tfree(graft);\n@@ -406,7 +406,7 @@ struct commit_list * insert_by_date(struct commit *item, struct commit_list **li\n  \treturn commit_list_insert(item, pp);\n  }\n\n-\t\n+\n  void sort_by_date(struct commit_list **list)\n  {\n  \tstruct commit_list *ret = NULL;\n@@ -1156,7 +1156,7 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo,\n  \t\tnext = next->next;\n  \t\tcount++;\n  \t}\n-\t\n+\n  \tif (!count)\n  \t\treturn;\n  \t/* allocate an array to help sort the list */\n@@ -1184,11 +1184,11 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo,\n  \t\t}\n  \t\tnext=next->next;\n  \t}\n-\t/*\n+\t/*\n           * find the tips\n           *\n-         * tips are nodes not reachable from any other node in the list\n-         *\n+         * tips are nodes not reachable from any other node in the list\n+         *\n           * the tips serve as a starting set for the work queue.\n           */\n  \tnext=*list;\n@@ -1216,7 +1216,7 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo,\n\n  \t\t\tif (pn) {\n  \t\t\t\t/*\n-\t\t\t\t * parents are only enqueued for emission\n+\t\t\t\t * parents are only enqueued for emission\n                                   * when all their children have been emitted thereby\n                                   * guaranteeing topological order.\n                                   */\ndiff --git a/compat/mmap.c b/compat/mmap.c\nindex 4cfaee3..c9d46d1 100644\n--- a/compat/mmap.c\n+++ b/compat/mmap.c\n@@ -40,4 +40,3 @@ int git_munmap(void *start, size_t length)\n  \tfree(start);\n  \treturn 0;\n  }\n-\ndiff --git a/config.c b/config.c\nindex 7b655fd..8d37aa6 100644\n--- a/config.c\n+++ b/config.c\n@@ -610,7 +610,7 @@ static ssize_t find_beginning_of_line(const char* contents, size_t size,\n  \tsize_t equal_offset = size, bracket_offset = size;\n  \tssize_t offset;\n\n-\tfor (offset = offset_-2; offset > 0\n+\tfor (offset = offset_-2; offset > 0\n  \t\t\t&& contents[offset] != '\\n'; offset--)\n  \t\tswitch (contents[offset]) {\n  \t\t\tcase '=': equal_offset = offset; break;\n@@ -978,4 +978,3 @@ int git_config_rename_section(const char *old_name, const char *new_name)\n  \tfree(config_filename);\n  \treturn ret;\n  }\n-\ndiff --git a/connect.c b/connect.c\nindex da89c9c..4382d43 100644\n--- a/connect.c\n+++ b/connect.c\n@@ -574,7 +574,7 @@ static int git_proxy_command_options(const char *var, const char *value)\n  \t\t}\n  \t\tif (0 <= matchlen) {\n  \t\t\t/* core.gitproxy = none for kernel.org */\n-\t\t\tif (matchlen == 4 &&\n+\t\t\tif (matchlen == 4 &&\n  \t\t\t    !memcmp(value, \"none\", 4))\n  \t\t\t\tmatchlen = 0;\n  \t\t\tgit_proxy_command = xmalloc(matchlen + 1);\ndiff --git a/convert-objects.c b/convert-objects.c\nindex cefbceb..90e7900 100644\n--- a/convert-objects.c\n+++ b/convert-objects.c\n@@ -194,7 +194,7 @@ static unsigned long parse_oldstyle_date(const char *buf)\n  \t\tfmt++;\n  \t} while (*buf && *fmt);\n  \tprintf(\"left: %s\\n\", buf);\n-\treturn mktime(&tm);\t\t\t\t\n+\treturn mktime(&tm);\n  }\n\n  static int convert_date_line(char *dst, void **buf, unsigned long *sp)\ndiff --git a/copy.c b/copy.c\nindex d340bb2..c225d1b 100644\n--- a/copy.c\n+++ b/copy.c\n@@ -34,4 +34,3 @@ int copy_fd(int ifd, int ofd)\n  \tclose(ifd);\n  \treturn 0;\n  }\n-\ndiff --git a/ctype.c b/ctype.c\nindex 56bdffa..ee06eb7 100644\n--- a/ctype.c\n+++ b/ctype.c\n@@ -20,4 +20,3 @@ unsigned char sane_ctype[256] = {\n  \tAA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA,  0,  0,  0,  0,  0,\t\t/* 112-15 */\n  \t/* Nothing in the 128.. range */\n  };\n-\ndiff --git a/daemon.c b/daemon.c\nindex e74ecac..a30324f 100644\n--- a/daemon.c\n+++ b/daemon.c\n@@ -133,7 +133,7 @@ static int avoid_alias(char *p)\n  {\n  \tint sl, ndot;\n\n-\t/*\n+\t/*\n  \t * This resurrects the belts and suspenders paranoia check by HPA\n  \t * done in <435560F7.4080006@zytor.com> thread, now enter_repo()\n  \t * does not do getcwd() based path canonicalizations.\n@@ -247,7 +247,7 @@ static char *path_ok(struct interp *itable)\n  \t\tint pathlen = strlen(path);\n\n  \t\t/* The validation is done on the paths after enter_repo\n-\t\t * appends optional {.git,.git/.git} and friends, but\n+\t\t * appends optional {.git,.git/.git} and friends, but\n  \t\t * it does not use getcwd().  So if your /pub is\n  \t\t * a symlink to /mnt/pub, you can whitelist /pub and\n  \t\t * do not have to say /mnt/pub.\ndiff --git a/date.c b/date.c\nindex a9b59a2..a5407f5 100644\n--- a/date.c\n+++ b/date.c\n@@ -403,7 +403,7 @@ static int match_multi_number(unsigned long num, char c, const char *date, char\n  }\n\n  /*\n- * We've seen a digit. Time? Year? Date?\n+ * We've seen a digit. Time? Year? Date?\n   */\n  static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt)\n  {\n@@ -493,7 +493,7 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt\n  \t} else if (num > 0 && num < 13) {\n  \t\ttm->tm_mon = num-1;\n  \t}\n-\t\t\n+\n  \treturn n;\n  }\n\n@@ -567,13 +567,13 @@ int parse_date(const char *date, char *result, int maxlen)\n  \t\tif (!match) {\n  \t\t\t/* BAD CRAP */\n  \t\t\tmatch = 1;\n-\t\t}\t\n+\t\t}\n\n  \t\tdate += match;\n  \t}\n\n  \t/* mktime uses local timezone */\n-\tthen = my_mktime(&tm);\n+\tthen = my_mktime(&tm);\n  \tif (offset == -1)\n  \t\toffset = (then - mktime(&tm)) / 60;\n\n@@ -689,7 +689,7 @@ static const struct typelen {\n  \t{ \"days\", 24*60*60 },\n  \t{ \"weeks\", 7*24*60*60 },\n  \t{ NULL }\n-};\t\n+};\n\n  static const char *approxidate_alpha(const char *date, struct tm *tm, int *num)\n  {\ndiff --git a/diff-lib.c b/diff-lib.c\nindex 07f4e81..7fb19c7 100644\n--- a/diff-lib.c\n+++ b/diff-lib.c\n@@ -664,7 +664,7 @@ int run_diff_index(struct rev_info *revs, int cached)\n  \tconst char *tree_name;\n  \tint match_missing = 0;\n\n-\t/*\n+\t/*\n  \t * Backward compatibility wart - \"diff-index -m\" does\n  \t * not mean \"do not ignore merges\", but totally different.\n  \t */\ndiff --git a/diff.c b/diff.c\nindex 33297aa..393c37a 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -3038,7 +3038,7 @@ void diff_addremove(struct diff_options *options,\n  \t * entries to the diff-core.  They will be prefixed\n  \t * with something like '=' or '*' (I haven't decided\n  \t * which but should not make any difference).\n-\t * Feeding the same new and old to diff_change()\n+\t * Feeding the same new and old to diff_change()\n  \t * also has the same effect.\n  \t * Before the final output happens, they are pruned after\n  \t * merged into rename/copy pairs as appropriate.\n@@ -3065,7 +3065,7 @@ void diff_change(struct diff_options *options,\n  \t\t unsigned old_mode, unsigned new_mode,\n  \t\t const unsigned char *old_sha1,\n  \t\t const unsigned char *new_sha1,\n-\t\t const char *base, const char *path)\n+\t\t const char *base, const char *path)\n  {\n  \tchar concatpath[PATH_MAX];\n  \tstruct diff_filespec *one, *two;\ndiff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c\nindex c4a77d7..af9fffe 100644\n--- a/diffcore-pickaxe.c\n+++ b/diffcore-pickaxe.c\n@@ -102,7 +102,7 @@ void diffcore_pickaxe(const char *needle, int opts)\n  \t\tfor (i = 0; i < q->nr; i++)\n  \t\t\tdiff_free_filepair(q->queue[i]);\n  \t}\n-\telse\n+\telse\n  \t\t/* Showing only the filepairs that has the needle */\n  \t\tfor (i = 0; i < q->nr; i++) {\n  \t\t\tstruct diff_filepair *p = q->queue[i];\ndiff --git a/entry.c b/entry.c\nindex 82bf725..581de3f 100644\n--- a/entry.c\n+++ b/entry.c\n@@ -31,7 +31,7 @@ static void remove_subtree(const char *path)\n  \tstruct dirent *de;\n  \tchar pathbuf[PATH_MAX];\n  \tchar *name;\n-\t\n+\n  \tif (!dir)\n  \t\tdie(\"cannot opendir %s (%s)\", path, strerror(errno));\n  \tstrcpy(pathbuf, path);\ndiff --git a/environment.c b/environment.c\nindex 2231659..a8855d3 100644\n--- a/environment.c\n+++ b/environment.c\n@@ -104,5 +104,3 @@ char *get_graft_file(void)\n  \t\tsetup_git_env();\n  \treturn git_graft_file;\n  }\n-\n-\ndiff --git a/fetch-pack.c b/fetch-pack.c\nindex 06f4aec..b6cb655 100644\n--- a/fetch-pack.c\n+++ b/fetch-pack.c\n@@ -114,7 +114,7 @@ static const unsigned char* get_rev(void)\n  \t\tcommit->object.flags |= POPPED;\n  \t\tif (!(commit->object.flags & COMMON))\n  \t\t\tnon_common_revs--;\n-\t\n+\n  \t\tparents = commit->parents;\n\n  \t\tif (commit->object.flags & COMMON) {\ndiff --git a/fetch.c b/fetch.c\nindex 8e29d31..dda33e5 100644\n--- a/fetch.c\n+++ b/fetch.c\n@@ -15,7 +15,7 @@ int get_verbosely = 0;\n  int get_recover = 0;\n  static unsigned char current_commit_sha1[20];\n\n-void pull_say(const char *fmt, const char *hex)\n+void pull_say(const char *fmt, const char *hex)\n  {\n  \tif (get_verbosely)\n  \t\tfprintf(stderr, fmt, hex);\n@@ -153,7 +153,7 @@ static int process(struct object *obj)\n  \t\t\treturn 0;\n  \t\tprefetch(obj->sha1);\n  \t}\n-\t\t\n+\n  \tobject_list_insert(obj, process_queue_end);\n  \tprocess_queue_end = &(*process_queue_end)->next;\n  \treturn 0;\ndiff --git a/help.c b/help.c\nindex 6a9af4d..1cd33ec 100644\n--- a/help.c\n+++ b/help.c\n@@ -219,5 +219,3 @@ int cmd_help(int argc, const char **argv, const char *prefix)\n\n  \treturn 0;\n  }\n-\n-\ndiff --git a/http-fetch.c b/http-fetch.c\nindex 09baedc..202fae0 100644\n--- a/http-fetch.c\n+++ b/http-fetch.c\n@@ -828,7 +828,7 @@ static void abort_object_request(struct object_request *obj_req)\n  \t}\n  \tunlink(obj_req->tmpfile);\n  \tif (obj_req->slot) {\n- \t\trelease_active_slot(obj_req->slot);\n+\t\trelease_active_slot(obj_req->slot);\n  \t\tobj_req->slot = NULL;\n  \t}\n  \trelease_object_request(obj_req);\ndiff --git a/http-push.c b/http-push.c\nindex e3f7675..c54ad9d 100644\n--- a/http-push.c\n+++ b/http-push.c\n@@ -517,7 +517,7 @@ static void start_put(struct transfer_request *request)\n  \trequest->buffer.size = stream.total_out;\n  \trequest->buffer.posn = 0;\n\n-\trequest->url = xmalloc(strlen(remote->url) +\n+\trequest->url = xmalloc(strlen(remote->url) +\n  \t\t\t       strlen(request->lock->token) + 51);\n  \tstrcpy(request->url, remote->url);\n  \tposn = request->url + strlen(remote->url);\ndiff --git a/http.c b/http.c\nindex ae27e0c..c6fb8ac 100644\n--- a/http.c\n+++ b/http.c\n@@ -137,7 +137,7 @@ static int http_options(const char *var, const char *value)\n  \t\treturn 0;\n  \t}\n\n-#ifdef USE_CURL_MULTI\t\n+#ifdef USE_CURL_MULTI\n  \tif (!strcmp(\"http.maxrequests\", var)) {\n  \t\tif (max_requests == -1)\n  \t\t\tmax_requests = git_config_int(var, value);\ndiff --git a/imap-send.c b/imap-send.c\nindex 4283a4a..a5a0696 100644\n--- a/imap-send.c\n+++ b/imap-send.c\n@@ -1239,7 +1239,7 @@ split_msg( msg_data_t *all_msgs, msg_data_t *msg, int *ofs )\n  \tmsg->data[ msg->len ] = 0;\n\n  \t*ofs += msg->len;\n- \treturn 1;\n+\treturn 1;\n  }\n\n  static imap_server_conf_t server =\ndiff --git a/local-fetch.c b/local-fetch.c\nindex 4b650ef..bf7ec6c 100644\n--- a/local-fetch.c\n+++ b/local-fetch.c\n@@ -114,7 +114,7 @@ static int fetch_pack(const unsigned char *sha1)\n  \t\treturn -1;\n  \ttarget = find_sha1_pack(sha1, packs);\n  \tif (!target)\n-\t\treturn error(\"Couldn't find %s: not separate or in any pack\",\n+\t\treturn error(\"Couldn't find %s: not separate or in any pack\",\n  \t\t\t     sha1_to_hex(sha1));\n  \tif (get_verbosely) {\n  \t\tfprintf(stderr, \"Getting pack %s\\n\",\n@@ -122,11 +122,11 @@ static int fetch_pack(const unsigned char *sha1)\n  \t\tfprintf(stderr, \" which contains %s\\n\",\n  \t\t\tsha1_to_hex(sha1));\n  \t}\n-\tsprintf(filename, \"%s/objects/pack/pack-%s.pack\",\n+\tsprintf(filename, \"%s/objects/pack/pack-%s.pack\",\n  \t\tpath, sha1_to_hex(target->sha1));\n  \tcopy_file(filename, sha1_pack_name(target->sha1),\n  \t\t  sha1_to_hex(target->sha1), 1);\n-\tsprintf(filename, \"%s/objects/pack/pack-%s.idx\",\n+\tsprintf(filename, \"%s/objects/pack/pack-%s.idx\",\n  \t\tpath, sha1_to_hex(target->sha1));\n  \tcopy_file(filename, sha1_pack_index_name(target->sha1),\n  \t\t  sha1_to_hex(target->sha1), 1);\n@@ -141,7 +141,7 @@ static int fetch_file(const unsigned char *sha1)\n  \tchar *hex = sha1_to_hex(sha1);\n  \tchar *dest_filename = sha1_file_name(sha1);\n\n- \tif (object_name_start < 0) {\n+\tif (object_name_start < 0) {\n  \t\tstrcpy(filename, path); /* e.g. git.git */\n  \t\tstrcat(filename, \"/objects/\");\n  \t\tobject_name_start = strlen(filename);\ndiff --git a/lockfile.c b/lockfile.c\nindex 23db35a..5ad2858 100644\n--- a/lockfile.c\n+++ b/lockfile.c\n@@ -97,4 +97,3 @@ void rollback_lock_file(struct lock_file *lk)\n  \t\tunlink(lk->filename);\n  \tlk->filename[0] = 0;\n  }\n-\ndiff --git a/mailmap.c b/mailmap.c\nindex cb567a2..8714167 100644\n--- a/mailmap.c\n+++ b/mailmap.c\n@@ -89,4 +89,3 @@ int map_email(struct path_list *map, const char *email, char *name, int maxlen)\n  \t}\n  \treturn 0;\n  }\n-\ndiff --git a/match-trees.c b/match-trees.c\nindex 23cafe4..d7e29c4 100644\n--- a/match-trees.c\n+++ b/match-trees.c\n@@ -301,4 +301,3 @@ void shift_tree(const unsigned char *hash1,\n\n  \tsplice_tree(hash1, add_prefix, hash2, shifted);\n  }\n-\ndiff --git a/merge-index.c b/merge-index.c\nindex 5599fd3..fa719cb 100644\n--- a/merge-index.c\n+++ b/merge-index.c\n@@ -25,7 +25,7 @@ static void run_program(void)\n  static int merge_entry(int pos, const char *path)\n  {\n  \tint found;\n-\t\n+\n  \tif (pos >= active_nr)\n  \t\tdie(\"git-merge-index: %s not in the cache\", path);\n  \targuments[0] = pgm;\ndiff --git a/mktag.c b/mktag.c\nindex 9310111..070bc96 100644\n--- a/mktag.c\n+++ b/mktag.c\n@@ -11,7 +11,7 @@\n   * The first three lines are guaranteed to be at least 63 bytes:\n   * \"object <sha1>\\n\" is 48 bytes, \"type tag\\n\" at 9 bytes is the\n   * shortest possible type-line, and \"tag .\\n\" at 6 bytes is the\n- * shortest single-character-tag line.\n+ * shortest single-character-tag line.\n   *\n   * We also artificially limit the size of the full object to 8kB.\n   * Just because I'm a lazy bastard, and if you can't fit a signature\ndiff --git a/mozilla-sha1/sha1.c b/mozilla-sha1/sha1.c\nindex 847531d..3f06b83 100644\n--- a/mozilla-sha1/sha1.c\n+++ b/mozilla-sha1/sha1.c\n@@ -1,29 +1,29 @@\n-/*\n+/*\n   * The contents of this file are subject to the Mozilla Public\n   * License Version 1.1 (the \"License\"); you may not use this file\n   * except in compliance with the License. You may obtain a copy of\n   * the License at http://www.mozilla.org/MPL/\n- *\n+ *\n   * Software distributed under the License is distributed on an \"AS\n   * IS\" basis, WITHOUT WARRANTY OF ANY KIND, either express or\n   * implied. See the License for the specific language governing\n   * rights and limitations under the License.\n- *\n+ *\n   * The Original Code is SHA 180-1 Reference Implementation (Compact version)\n- *\n+ *\n   * The Initial Developer of the Original Code is Paul Kocher of\n- * Cryptography Research.  Portions created by Paul Kocher are\n+ * Cryptography Research.  Portions created by Paul Kocher are\n   * Copyright (C) 1995-9 by Cryptography Research, Inc.  All\n   * Rights Reserved.\n- *\n+ *\n   * Contributor(s):\n   *\n   *     Paul Kocher\n- *\n+ *\n   * Alternatively, the contents of this file may be used under the\n   * terms of the GNU General Public License Version 2 or later (the\n- * \"GPL\"), in which case the provisions of the GPL are applicable\n- * instead of those above.  If you wish to allow use of your\n+ * \"GPL\"), in which case the provisions of the GPL are applicable\n+ * instead of those above.  If you wish to allow use of your\n   * version of this file only under the terms of the GPL and not to\n   * allow others to use your version of this file under the MPL,\n   * indicate your decision by deleting the provisions above and\n@@ -149,4 +149,3 @@ static void shaHashBlock(SHA_CTX *ctx) {\n    ctx->H[3] += D;\n    ctx->H[4] += E;\n  }\n-\ndiff --git a/object-refs.c b/object-refs.c\nindex 022e8d8..5345671 100644\n--- a/object-refs.c\n+++ b/object-refs.c\n@@ -85,5 +85,3 @@ void mark_reachable(struct object *obj, unsigned int mask)\n  \t\t\tmark_reachable(refs->ref[i], mask);\n  \t}\n  }\n-\n-\ndiff --git a/pack-redundant.c b/pack-redundant.c\nindex 87077e1..876071f 100644\n--- a/pack-redundant.c\n+++ b/pack-redundant.c\n@@ -81,7 +81,7 @@ static struct llist * llist_copy(struct llist *list)\n  {\n  \tstruct llist *ret;\n  \tstruct llist_item *new, *old, *prev;\n-\t\n+\n  \tllist_init(&ret);\n\n  \tif ((ret->size = list->size) == 0)\n@@ -100,7 +100,7 @@ static struct llist * llist_copy(struct llist *list)\n  \t}\n  \tnew->next = NULL;\n  \tret->back = new;\n-\t\n+\n  \treturn ret;\n  }\n\ndiff --git a/patch-id.c b/patch-id.c\nindex 086d2d9..9349bc5 100644\n--- a/patch-id.c\n+++ b/patch-id.c\n@@ -81,4 +81,4 @@ int main(int argc, char **argv)\n\n  \tgenerate_id_list();\n  \treturn 0;\n-}\t\n+}\ndiff --git a/path-list.c b/path-list.c\nindex caaa5cc..dcb4b3a 100644\n--- a/path-list.c\n+++ b/path-list.c\n@@ -100,4 +100,3 @@ void print_path_list(const char *text, const struct path_list *p)\n  \tfor (i = 0; i < p->nr; i++)\n  \t\tprintf(\"%s:%p\\n\", p->items[i].path, p->items[i].util);\n  }\n-\ndiff --git a/pkt-line.c b/pkt-line.c\nindex b605268..355546a 100644\n--- a/pkt-line.c\n+++ b/pkt-line.c\n@@ -5,7 +5,7 @@\n   * Write a packetized stream, where each line is preceded by\n   * its length (including the header) as a 4-byte hex number.\n   * A length of 'zero' means end of stream (and a length of 1-3\n- * would be an error).\n+ * would be an error).\n   *\n   * This is all pretty stupid, but we use this packetized line\n   * format to make a streaming format possible without ever\ndiff --git a/ppc/sha1.c b/ppc/sha1.c\nindex 0820398..738e36c 100644\n--- a/ppc/sha1.c\n+++ b/ppc/sha1.c\n@@ -50,7 +50,7 @@ int SHA1_Update(SHA_CTX *c, const void *ptr, unsigned long n)\n  \t\tp += nb;\n  \t}\n  \treturn 0;\n-}\t\n+}\n\n  int SHA1_Final(unsigned char *hash, SHA_CTX *c)\n  {\ndiff --git a/read-cache.c b/read-cache.c\nindex d9f46da..0f0c827 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -166,7 +166,7 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)\n  \t\tchanged |= MTIME_CHANGED;\n  \tif (ce->ce_ctime.nsec != htonl(st->st_ctim.tv_nsec))\n  \t\tchanged |= CTIME_CHANGED;\n-#endif\t\n+#endif\n\n  \tif (ce->ce_uid != htonl(st->st_uid) ||\n  \t    ce->ce_gid != htonl(st->st_gid))\n@@ -597,7 +597,7 @@ static int has_dir_name(struct index_state *istate,\n   * is being added, or we already have path and path/file is being\n   * added.  Either one would result in a nonsense tree that has path\n   * twice when git-write-tree tries to write it out.  Prevent it.\n- *\n+ *\n   * If ok-to-replace is specified, we remove the conflicting entries\n   * from the cache so the caller should recompute the insert position.\n   * When this happens, we return non-zero.\n@@ -970,8 +970,8 @@ static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len)\n  \t\twrite_buffer_len = buffered;\n  \t\tlen -= partial;\n  \t\tdata = (char *) data + partial;\n- \t}\n- \treturn 0;\n+\t}\n+\treturn 0;\n  }\n\n  static int write_index_ext_header(SHA_CTX *context, int fd,\n@@ -1037,7 +1037,7 @@ static void ce_smudge_racily_clean_entry(struct cache_entry *ce)\n  \t\t * size to zero here, then the object name recorded\n  \t\t * in index is the 6-byte file but the cached stat information\n  \t\t * becomes zero --- which would then match what we would\n-\t\t * obtain from the filesystem next time we stat(\"frotz\").\n+\t\t * obtain from the filesystem next time we stat(\"frotz\").\n  \t\t *\n  \t\t * However, the second update-index, before calling\n  \t\t * this function, notices that the cached size is 6\ndiff --git a/setup.c b/setup.c\nindex a45ea83..14f62c4 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -39,7 +39,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)\n  \tif (len) {\n  \t\tint speclen = strlen(path);\n  \t\tchar *n = xmalloc(speclen + len + 1);\n-\t\n+\n  \t\tmemcpy(n, prefix, len);\n  \t\tmemcpy(n + len, path, speclen+1);\n  \t\tpath = n;\n@@ -47,7 +47,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)\n  \treturn path;\n  }\n\n-/*\n+/*\n   * Unlike prefix_path, this should be used if the named file does\n   * not have to interact with index entry; i.e. name of a random file\n   * on the filesystem.\ndiff --git a/sha1_file.c b/sha1_file.c\nindex be991ed..d3a721b 100644\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -193,7 +193,7 @@ char *sha1_pack_name(const unsigned char *sha1)\n  \t\t*buf++ = hex[val >> 4];\n  \t\t*buf++ = hex[val & 0xf];\n  \t}\n-\t\n+\n  \treturn base;\n  }\n\n@@ -218,7 +218,7 @@ char *sha1_pack_index_name(const unsigned char *sha1)\n  \t\t*buf++ = hex[val >> 4];\n  \t\t*buf++ = hex[val & 0xf];\n  \t}\n-\t\n+\n  \treturn base;\n  }\n\n@@ -1109,7 +1109,7 @@ static int parse_sha1_header(const char *hdr, unsigned long *sizep)\n  \tunsigned long size;\n\n  \t/*\n-\t * The type can be at most ten bytes (including the\n+\t * The type can be at most ten bytes (including the\n  \t * terminating '\\0' that we add), and is followed by\n  \t * a space.\n  \t */\n@@ -1683,7 +1683,7 @@ static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e, cons\n  \treturn 0;\n  }\n\n-struct packed_git *find_sha1_pack(const unsigned char *sha1,\n+struct packed_git *find_sha1_pack(const unsigned char *sha1,\n  \t\t\t\t  struct packed_git *packs)\n  {\n  \tstruct packed_git *p;\ndiff --git a/shallow.c b/shallow.c\nindex d178689..dbd9f5a 100644\n--- a/shallow.c\n+++ b/shallow.c\n@@ -101,4 +101,3 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,\n\n  \treturn result;\n  }\n-\ndiff --git a/ssh-upload.c b/ssh-upload.c\nindex 498d41e..20c35f0 100644\n--- a/ssh-upload.c\n+++ b/ssh-upload.c\n@@ -29,24 +29,24 @@ static int serve_object(int fd_in, int fd_out) {\n  \t}\n  \tif (!size)\n  \t\treturn -1;\n-\t\n+\n  \tif (verbose)\n  \t\tfprintf(stderr, \"Serving %s\\n\", sha1_to_hex(sha1));\n\n  \tremote = 0;\n-\t\n+\n  \tif (!has_sha1_file(sha1)) {\n  \t\tfprintf(stderr, \"git-ssh-upload: could not find %s\\n\",\n  \t\t\tsha1_to_hex(sha1));\n  \t\tremote = -1;\n  \t}\n-\t\n+\n  \tif (write_in_full(fd_out, &remote, 1) != 1)\n  \t\treturn 0;\n-\t\n+\n  \tif (remote < 0)\n  \t\treturn 0;\n-\t\n+\n  \treturn write_sha1_to_fd(fd_out, sha1);\n  }\n\ndiff --git a/strbuf.c b/strbuf.c\nindex 7f14b0f..e33d06b 100644\n--- a/strbuf.c\n+++ b/strbuf.c\n@@ -39,4 +39,3 @@ void read_line(struct strbuf *sb, FILE *fp, int term) {\n  \t\tsb->eof = 1;\n  \tstrbuf_end(sb);\n  }\n-\ndiff --git a/tree-walk.c b/tree-walk.c\nindex cbb24eb..8d4b673 100644\n--- a/tree-walk.c\n+++ b/tree-walk.c\n@@ -206,4 +206,3 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch\n  \tfree(tree);\n  \treturn retval;\n  }\n-\ndiff --git a/upload-pack.c b/upload-pack.c\nindex d3a09e7..0e881c8 100644\n--- a/upload-pack.c\n+++ b/upload-pack.c\n@@ -678,7 +678,7 @@ int main(int argc, char **argv)\n  \t\t\tbreak;\n  \t\t}\n  \t}\n-\t\n+\n  \tif (i != argc-1)\n  \t\tusage(upload_pack_usage);\n  \tdir = argv[i];\ndiff --git a/var.c b/var.c\nindex e585e59..4127031 100644\n--- a/var.c\n+++ b/var.c\n@@ -67,8 +67,8 @@ int main(int argc, char **argv)\n  \tval = read_var(argv[1]);\n  \tif (!val)\n  \t\tusage(var_usage);\n-\t\n+\n  \tprintf(\"%s\\n\", val);\n-\t\n+\n  \treturn 0;\n  }\ndiff --git a/xdiff-interface.c b/xdiff-interface.c\nindex 10816e9..3421efd 100644\n--- a/xdiff-interface.c\n+++ b/xdiff-interface.c\n@@ -121,5 +121,3 @@ int read_mmfile(mmfile_t *ptr, const char *filename)\n  \tptr->size = sz;\n  \treturn 0;\n  }\n-\n-\ndiff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c\nindex 9aeebc4..5cb7171 100644\n--- a/xdiff/xdiffi.c\n+++ b/xdiff/xdiffi.c\n@@ -565,4 +565,3 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,\n\n  \treturn 0;\n  }\n-\ndiff --git a/xdiff/xemit.c b/xdiff/xemit.c\nindex e291dc7..78b1d4b 100644\n--- a/xdiff/xemit.c\n+++ b/xdiff/xemit.c\n@@ -194,4 +194,3 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,\n\n  \treturn 0;\n  }\n-\ndiff --git a/xdiff/xprepare.c b/xdiff/xprepare.c\nindex 1be7b31..e87ab57 100644\n--- a/xdiff/xprepare.c\n+++ b/xdiff/xprepare.c\n@@ -466,4 +466,3 @@ static int xdl_optimize_ctxs(xdfile_t *xdf1, xdfile_t *xdf2) {\n\n  \treturn 0;\n  }\n-\ndiff --git a/xdiff/xutils.c b/xdiff/xutils.c\nindex bf91c0f..2ade97b 100644\n--- a/xdiff/xutils.c\n+++ b/xdiff/xutils.c\n@@ -380,4 +380,3 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,\n\n  \treturn 0;\n  }\n-\n-- \n1.5.2.rc3.90.gf33e-dirty\n"},{"id":"42801","messageId":"7vfy5rjhyq.fsf@assigned-by-dhcp.cox.net","threadId":"8235","inReplyTo":"4650222D.4070707@gmail.com","subject":"Re: [PATCH 1/6] Remove whitespace breakage from *.c files","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-05-20T21:36:13Z","receivedAt":"2007-05-20T21:36:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Your MUA seem to have munged all your patches in this series;\nand the breakage seems also to be in the \"let apply eat the new\ntrailing blank lines\" patch.\n"},{"id":"42887","messageId":"e5bfff550705210454s6e89fb2frb8cb74ea97d7c2ca@mail.gmail.com","threadId":"8235","inReplyTo":"7vfy5rjhyq.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH 1/6] Remove whitespace breakage from *.c files","fromName":"Marco Costalba","fromEmail":"mcostalba@gmail.com","sentAt":"2007-05-21T11:54:11Z","receivedAt":"2007-05-21T11:54:11Z","isPatch":true,"sender":{"key":"mcostalba@gmail.com","avatar":null},"body":"On 5/20/07, Junio C Hamano <junkio@cox.net> wrote:\n> Your MUA seem to have munged all your patches in this series;\n> and the breakage seems also to be in the \"let apply eat the new\n> trailing blank lines\" patch.\n>\n\nI'm very sorry about this. I have set maximum length to 120 chars in\nThunderbird, but probably there's something more to tweak.\n\nI can resend all the patches next week-end if you want. But please\nfeel free to create and apply the patches yourself when you prefer. I\nunderstand that this kind of patches are mostly automatically created\nand also touch a lot of files so the manteiner has the best _timing_\nto create and apply them.\n\nMarco\n"},{"id":"42902","messageId":"7vmyzydtbt.fsf@assigned-by-dhcp.cox.net","threadId":"8235","inReplyTo":"e5bfff550705210454s6e89fb2frb8cb74ea97d7c2ca@mail.gmail.com","subject":"Re: [PATCH 1/6] Remove whitespace breakage from *.c files","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-05-21T16:39:34Z","receivedAt":"2007-05-21T16:39:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Marco Costalba\" <mcostalba@gmail.com> writes:\n\n> ... I\n> understand that this kind of patches are mostly automatically created\n> and also touch a lot of files so the manteiner has the best _timing_\n> to create and apply them.\n\nI was thinking about the same thing last night.  The tips of\n'master' branch and 'next' branch were identical after pushing\nout the \"first batch\" I announced in the last \"What's cooking\"\nmessage, and it was really a good time to do this kind of thing.\n\nWill do, sometime soon.\n"}]}