Remove whitespace breakage from *.c files
PATCH 1/6 Remove whitespace breakage from *.c files
This patch removes whitespace found with the following commands, as suggested by Junio. Suggestion to do not consider also Documentation/ directory is from Johannes.
$ git checkout master $ rm -f .git/index $ git checkout HEAD -- t/ Documentation/ $ git clean -x -d $ git diff -R --binary HEAD >P.diff $ git apply --index --whitespace=strip P.diff
'git apply' has been modified to trim empty lines at the end of file.
This patch applies to *.c files only
Signed-off-by Marco Costalba <[email protected]>
--- arm/sha1.c | 4 ++-- builtin-annotate.c | 1 - builtin-diff-index.c | 2 +- builtin-fmt-merge-msg.c | 1 - builtin-fsck.c | 4 ++-- builtin-ls-files.c | 2 +- builtin-name-rev.c | 1 - builtin-pack-objects.c | 2 +- builtin-rerere.c | 1 - builtin-shortlog.c | 1 - commit.c | 14 +++++++------- compat/mmap.c | 1 - config.c | 3 +-- connect.c | 2 +- convert-objects.c | 2 +- copy.c | 1 - ctype.c | 1 - daemon.c | 4 ++-- date.c | 10 +++++----- diff-lib.c | 2 +- diff.c | 4 ++-- diffcore-pickaxe.c | 2 +- entry.c | 2 +- environment.c | 2 -- fetch-pack.c | 2 +- fetch.c | 4 ++-- help.c | 2 -- http-fetch.c | 2 +- http-push.c | 2 +- http.c | 2 +- imap-send.c | 2 +- local-fetch.c | 8 ++++---- lockfile.c | 1 - mailmap.c | 1 - match-trees.c | 1 - merge-index.c | 2 +- mktag.c | 2 +- mozilla-sha1/sha1.c | 19 +++++++++---------- object-refs.c | 2 -- pack-redundant.c | 4 ++-- patch-id.c | 2 +- path-list.c | 1 - pkt-line.c | 2 +- ppc/sha1.c | 2 +- read-cache.c | 10 +++++----- setup.c | 4 ++-- sha1_file.c | 8 ++++---- shallow.c | 1 - ssh-upload.c | 10 +++++----- strbuf.c | 1 - tree-walk.c | 1 - upload-pack.c | 2 +- var.c | 4 ++-- xdiff-interface.c | 2 -- xdiff/xdiffi.c | 1 - xdiff/xemit.c | 1 - xdiff/xprepare.c | 1 - xdiff/xutils.c | 1 - 58 files changed, 75 insertions(+), 104 deletions(-)
arm/sha1.c +2 -2
@@ -49,7 +49,7 @@ void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n)void SHA1_Final (unsigned char *hash,SHA_CTX *c) {uint64_t bitlen; -uint32_t bitlen_hi, bitlen_lo; +uint32_t bitlen_hi, bitlen_lo;unsigned int i, offset, padlen;unsigned char bits[8 ];static const unsigned char padding[64 ] = {0x80 , };
@@ -69,7 +69,7 @@ void SHA1_Final(unsigned char *hash, SHA_CTX *c) bits[5 ] = bitlen_lo >>16 ; bits[6 ] = bitlen_lo >>8 ; bits[7 ] = bitlen_lo; -SHA1_Update (c, bits,8 ); +SHA1_Update (c, bits,8 );for (i =0 ; i <5 ; i++) {uint32_t v = c->hash[i];
builtin-annotate.c +0 -1
@@ -22,4 +22,3 @@ int cmd_annotate(int argc, const char **argv, const char *prefix)return cmd_blame (argc +1 , nargv, prefix); } -
builtin-diff-index.c +1 -1
@@ -23,7 +23,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) argc =setup_revisions (argc, argv, &rev,NULL );for (i =1 ; i < argc; i++) {const char *arg = argv[i]; - +if (!strcmp (arg,"--cached" )) cached =1 ;else
builtin-fmt-merge-msg.c +0 -1
@@ -357,4 +357,3 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)return 0 ; } -
builtin-fsck.c +2 -2
@@ -336,7 +336,7 @@ static int fsck_commit(struct commit *commit)if (!commit->parents && show_root)printf ("root %s\n" ,sha1_to_hex (commit->object.sha1));if (!commit->date) -printf ("bad commit date in %s\n" , +printf ("bad commit date in %s\n" ,sha1_to_hex (commit->object.sha1));return 0 ; }
@@ -676,7 +676,7 @@ int cmd_fsck(int argc, char **argv, const char *prefix) heads =0 ;for (i =1 ; i < argc; i++) { -const char *arg = argv[i]; +const char *arg = argv[i];if (*arg =='-' )continue ;
builtin-ls-files.c +1 -1
@@ -117,7 +117,7 @@ static void show_other_files(struct dir_struct *dir)if (0 <= pos)continue ;/* exact match */ pos = -pos -1 ; -if (pos < active_nr) { +if (pos < active_nr) { ce = active_cache[pos];if (ce_namelen (ce) == len && !memcmp (ce->name, ent->name, len))
builtin-name-rev.c +0 -1
@@ -275,4 +275,3 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)return 0 ; } -
builtin-pack-objects.c +1 -1
@@ -242,7 +242,7 @@ static void *delta_against(void *buf, unsigned long size, struct object_entry *e delta_buf =diff_delta (otherbuf, othersize, buf, size, &delta_size,0 );if (!delta_buf || delta_size != entry->delta_size) -die ("delta size changed" ); +die ("delta size changed" );free (buf);free (otherbuf);return delta_buf;
builtin-rerere.c +0 -1
@@ -434,4 +434,3 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)path_list_clear (&merge_rr,1 );return 0 ; } -
builtin-shortlog.c +0 -1
@@ -331,4 +331,3 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)return 0 ; } -
commit.c +7 -7
@@ -148,7 +148,7 @@ static int commit_graft_pos(const unsigned char *sha1)int register_commit_graft (struct commit_graft *graft,int ignore_dups) {int pos =commit_graft_pos (graft->sha1); - +if (0 <= pos) {if (ignore_dups)free (graft);
@@ -406,7 +406,7 @@ struct commit_list * insert_by_date(struct commit *item, struct commit_list **lireturn commit_list_insert (item, pp); } - +void sort_by_date (struct commit_list **list) {struct commit_list *ret =NULL ;
@@ -1156,7 +1156,7 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo, next = next->next; count++; } - +if (!count)return ;/* allocate an array to help sort the list */
@@ -1184,11 +1184,11 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo, } next=next->next; } -/* +/* * find the tips * -* tips are nodes not reachable from any other node in the list -* +* tips are nodes not reachable from any other node in the list +* * the tips serve as a starting set for the work queue. */ next=*list;
@@ -1216,7 +1216,7 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo,if (pn) {/* -* parents are only enqueued for emission +* parents are only enqueued for emission * when all their children have been emitted thereby * guaranteeing topological order. */
compat/mmap.c +0 -1
@@ -40,4 +40,3 @@ int git_munmap(void *start, size_t length)free (start);return 0 ; } -
config.c +1 -2
@@ -610,7 +610,7 @@ static ssize_t find_beginning_of_line(const char* contents, size_t size,size_t equal_offset = size, bracket_offset = size;ssize_t offset; -for (offset = offset_-2 ; offset >0 +for (offset = offset_-2 ; offset >0 && contents[offset] !='\n' ; offset--)switch (contents[offset]) {case '=' : equal_offset = offset;break ;
@@ -978,4 +978,3 @@ int git_config_rename_section(const char *old_name, const char *new_name)free (config_filename);return ret; } -
connect.c +1 -1
@@ -574,7 +574,7 @@ static int git_proxy_command_options(const char *var, const char *value) }if (0 <= matchlen) {/* core.gitproxy = none for kernel.org */ -if (matchlen ==4 && +if (matchlen ==4 && !memcmp (value,"none" ,4 )) matchlen =0 ; git_proxy_command =xmalloc (matchlen +1 );
convert-objects.c +1 -1
@@ -194,7 +194,7 @@ static unsigned long parse_oldstyle_date(const char *buf) fmt++; }while (*buf && *fmt);printf ("left: %s\n" , buf); -return mktime (&tm); +return mktime (&tm); }static int convert_date_line (char *dst,void **buf,unsigned long *sp)
copy.c +0 -1
@@ -34,4 +34,3 @@ int copy_fd(int ifd, int ofd)close (ifd);return 0 ; } -
ctype.c +0 -1
@@ -20,4 +20,3 @@ unsigned char sane_ctype[256] = { AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, AA, 0, 0, 0, 0, 0, /* 112-15 */ /* Nothing in the 128.. range */ }; -
daemon.c +2 -2
@@ -133,7 +133,7 @@ static int avoid_alias(char *p) {int sl, ndot; -/* +/* * This resurrects the belts and suspenders paranoia check by HPA * done in <[email protected]> thread, now enter_repo() * does not do getcwd() based path canonicalizations.
@@ -247,7 +247,7 @@ static char *path_ok(struct interp *itable)int pathlen =strlen (path);/* The validation is done on the paths after enter_repo -* appends optional {.git,.git/.git} and friends, but +* appends optional {.git,.git/.git} and friends, but * it does not use getcwd(). So if your /pub is * a symlink to /mnt/pub, you can whitelist /pub and * do not have to say /mnt/pub.
date.c +5 -5
@@ -403,7 +403,7 @@ static int match_multi_number(unsigned long num, char c, const char *date, char }/* -* We've seen a digit. Time? Year? Date? +* We've seen a digit. Time? Year? Date? */ static int match_digit (const char *date,struct tm *tm,int *offset,int *tm_gmt) {
@@ -493,7 +493,7 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt }else if (num >0 && num <13 ) { tm->tm_mon = num-1 ; } - +return n; }
@@ -567,13 +567,13 @@ int parse_date(const char *date, char *result, int maxlen)if (!match) {/* BAD CRAP */ match =1 ; - } + } date += match; }/* mktime uses local timezone */ - then =my_mktime (&tm); + then =my_mktime (&tm);if (offset ==-1 ) offset = (then -mktime (&tm)) /60 ;
@@ -689,7 +689,7 @@ static const struct typelen { { "days", 24*60*60 }, { "weeks", 7*24*60*60 }, { NULL } -}; +};static const char *approxidate_alpha (const char *date,struct tm *tm,int *num) {
diff-lib.c +1 -1
@@ -664,7 +664,7 @@ int run_diff_index(struct rev_info *revs, int cached)const char *tree_name;int match_missing =0 ; -/* +/* * Backward compatibility wart - "diff-index -m" does * not mean "do not ignore merges", but totally different. */
diff.c +2 -2
@@ -3038,7 +3038,7 @@ void diff_addremove(struct diff_options *options,* entries to the diff-core. They will be prefixed * with something like '=' or '*' (I haven't decided * which but should not make any difference). -* Feeding the same new and old to diff_change() +* Feeding the same new and old to diff_change() * also has the same effect. * Before the final output happens, they are pruned after * merged into rename/copy pairs as appropriate.
@@ -3065,7 +3065,7 @@ void diff_change(struct diff_options *options, unsigned old_mode, unsigned new_mode, const unsigned char *old_sha1, const unsigned char *new_sha1, - const char *base, const char *path) + const char *base, const char *path) { char concatpath[PATH_MAX];struct diff_filespec *one, *two;
diffcore-pickaxe.c +1 -1
@@ -102,7 +102,7 @@ void diffcore_pickaxe(const char *needle, int opts)for (i =0 ; i < q->nr; i++)diff_free_filepair (q->queue[i]); } -else +else /* Showing only the filepairs that has the needle */ for (i =0 ; i < q->nr; i++) {struct diff_filepair *p = q->queue[i];
entry.c +1 -1
@@ -31,7 +31,7 @@ static void remove_subtree(const char *path)struct dirent *de;char pathbuf[PATH_MAX ];char *name; - +if (!dir)die ("cannot opendir %s (%s)" , path,strerror (errno));strcpy (pathbuf, path);
environment.c +0 -2
@@ -104,5 +104,3 @@ char *get_graft_file(void)setup_git_env ();return git_graft_file; } - -
fetch-pack.c +1 -1
@@ -114,7 +114,7 @@ static const unsigned char* get_rev(void) commit->object.flags |=POPPED ;if (!(commit->object.flags &COMMON )) non_common_revs--; - + parents = commit->parents;if (commit->object.flags &COMMON ) {
fetch.c +2 -2
@@ -15,7 +15,7 @@ int get_verbosely = 0;int get_recover =0 ;static unsigned char current_commit_sha1[20 ]; -void pull_say (const char *fmt,const char *hex) +void pull_say (const char *fmt,const char *hex) {if (get_verbosely)fprintf (stderr, fmt, hex);
@@ -153,7 +153,7 @@ static int process(struct object *obj)return 0 ;prefetch (obj->sha1); } - +object_list_insert (obj, process_queue_end); process_queue_end = &(*process_queue_end)->next;return 0 ;
help.c +0 -2
@@ -219,5 +219,3 @@ int cmd_help(int argc, const char **argv, const char *prefix)return 0 ; } - -
http-fetch.c +1 -1
@@ -828,7 +828,7 @@ static void abort_object_request(struct object_request *obj_req) }unlink (obj_req->tmpfile);if (obj_req->slot) { -release_active_slot (obj_req->slot); +release_active_slot (obj_req->slot); obj_req->slot =NULL ; }release_object_request (obj_req);
http-push.c +1 -1
@@ -517,7 +517,7 @@ static void start_put(struct transfer_request *request) request->buffer.size = stream.total_out; request->buffer.posn =0 ; - request->url =xmalloc (strlen (remote->url) + + request->url =xmalloc (strlen (remote->url) +strlen (request->lock->token) +51 );strcpy (request->url, remote->url); posn = request->url +strlen (remote->url);
http.c +1 -1
@@ -137,7 +137,7 @@ static int http_options(const char *var, const char *value)return 0 ; } -#ifdef USE_CURL_MULTI +#ifdef USE_CURL_MULTI if (!strcmp ("http.maxrequests" , var)) {if (max_requests ==-1 ) max_requests =git_config_int (var, value);
imap-send.c +1 -1
@@ -1239,7 +1239,7 @@ split_msg( msg_data_t *all_msgs, msg_data_t *msg, int *ofs ) msg->data[ msg->len ] =0 ; *ofs += msg->len; -return 1 ; +return 1 ; } static imap_server_conf_t server =
local-fetch.c +4 -4
@@ -114,7 +114,7 @@ static int fetch_pack(const unsigned char *sha1)return -1 ; target =find_sha1_pack (sha1, packs);if (!target) -return error ("Couldn't find %s: not separate or in any pack" , +return error ("Couldn't find %s: not separate or in any pack" ,sha1_to_hex (sha1));if (get_verbosely) { fprintf(stderr, "Getting pack %s\n",
@@ -122,11 +122,11 @@ static int fetch_pack(const unsigned char *sha1)fprintf (stderr," which contains %s\n" ,sha1_to_hex (sha1)); } -sprintf (filename,"%s/objects/pack/pack-%s.pack" , +sprintf (filename,"%s/objects/pack/pack-%s.pack" , path,sha1_to_hex (target->sha1));copy_file (filename,sha1_pack_name (target->sha1),sha1_to_hex (target->sha1),1 ); -sprintf (filename,"%s/objects/pack/pack-%s.idx" , +sprintf (filename,"%s/objects/pack/pack-%s.idx" , path,sha1_to_hex (target->sha1));copy_file (filename,sha1_pack_index_name (target->sha1),sha1_to_hex (target->sha1),1 );
@@ -141,7 +141,7 @@ static int fetch_file(const unsigned char *sha1)char *hex =sha1_to_hex (sha1);char *dest_filename =sha1_file_name (sha1); -if (object_name_start <0 ) { +if (object_name_start <0 ) {strcpy (filename, path);/* e.g. git.git */ strcat (filename,"/objects/" ); object_name_start =strlen (filename);
lockfile.c +0 -1
@@ -97,4 +97,3 @@ void rollback_lock_file(struct lock_file *lk)unlink (lk->filename); lk->filename[0 ] =0 ; } -
mailmap.c +0 -1
@@ -89,4 +89,3 @@ int map_email(struct path_list *map, const char *email, char *name, int maxlen) }return 0 ; } -
match-trees.c +0 -1
@@ -301,4 +301,3 @@ void shift_tree(const unsigned char *hash1,splice_tree (hash1, add_prefix, hash2, shifted); } -
merge-index.c +1 -1
@@ -25,7 +25,7 @@ static void run_program(void)static int merge_entry (int pos,const char *path) {int found; - +if (pos >= active_nr)die ("git-merge-index: %s not in the cache" , path); arguments[0 ] = pgm;
mktag.c +1 -1
@@ -11,7 +11,7 @@* The first three lines are guaranteed to be at least 63 bytes: * "object <sha1>\n" is 48 bytes, "type tag\n" at 9 bytes is the * shortest possible type-line, and "tag .\n" at 6 bytes is the -* shortest single-character-tag line. +* shortest single-character-tag line. * * We also artificially limit the size of the full object to 8kB. * Just because I'm a lazy bastard, and if you can't fit a signature
mozilla-sha1/sha1.c +9 -10
@@ -1,29 +1,29 @@ -/* +/* * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.mozilla.org/MPL/ -* +* * Software distributed under the License is distributed on an "AS * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. -* +* * The Original Code is SHA 180-1 Reference Implementation (Compact version) -* +* * The Initial Developer of the Original Code is Paul Kocher of -* Cryptography Research. Portions created by Paul Kocher are +* Cryptography Research. Portions created by Paul Kocher are * Copyright (C) 1995-9 by Cryptography Research, Inc. All * Rights Reserved. -* +* * Contributor(s): * * Paul Kocher -* +* * Alternatively, the contents of this file may be used under the * terms of the GNU General Public License Version 2 or later (the -* "GPL"), in which case the provisions of the GPL are applicable -* instead of those above. If you wish to allow use of your +* "GPL"), in which case the provisions of the GPL are applicable +* instead of those above. If you wish to allow use of your * version of this file only under the terms of the GPL and not to * allow others to use your version of this file under the MPL, * indicate your decision by deleting the provisions above and
@@ -149,4 +149,3 @@ static void shaHashBlock(SHA_CTX *ctx) { ctx->H[3 ] +=D ; ctx->H[4 ] +=E ; } -
object-refs.c +0 -2
@@ -85,5 +85,3 @@ void mark_reachable(struct object *obj, unsigned int mask)mark_reachable (refs->ref[i], mask); } } - -
pack-redundant.c +2 -2
@@ -81,7 +81,7 @@ static struct llist * llist_copy(struct llist *list) {struct llist *ret;struct llist_item *new, *old, *prev; - +llist_init (&ret);if ((ret->size = list->size) ==0 )
@@ -100,7 +100,7 @@ static struct llist * llist_copy(struct llist *list) } new->next =NULL ; ret->back = new; - +return ret; }
patch-id.c +1 -1
@@ -81,4 +81,4 @@ int main(int argc, char **argv)generate_id_list ();return 0 ; -} +}
path-list.c +0 -1
@@ -100,4 +100,3 @@ void print_path_list(const char *text, const struct path_list *p)for (i =0 ; i < p->nr; i++)printf ("%s:%p\n" , p->items[i].path, p->items[i].util); } -
pkt-line.c +1 -1
@@ -5,7 +5,7 @@* Write a packetized stream, where each line is preceded by * its length (including the header) as a 4-byte hex number. * A length of 'zero' means end of stream (and a length of 1-3 -* would be an error). +* would be an error). * * This is all pretty stupid, but we use this packetized line * format to make a streaming format possible without ever
ppc/sha1.c +1 -1
@@ -50,7 +50,7 @@ int SHA1_Update(SHA_CTX *c, const void *ptr, unsigned long n) p += nb; }return 0 ; -} +}int SHA1_Final (unsigned char *hash,SHA_CTX *c) {
read-cache.c +5 -5
@@ -166,7 +166,7 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st) changed |=MTIME_CHANGED ;if (ce->ce_ctime.nsec !=htonl (st->st_ctim.tv_nsec)) changed |=CTIME_CHANGED ; -#endif +#endif if (ce->ce_uid !=htonl (st->st_uid) || ce->ce_gid !=htonl (st->st_gid))
@@ -597,7 +597,7 @@ static int has_dir_name(struct index_state *istate,* is being added, or we already have path and path/file is being * added. Either one would result in a nonsense tree that has path * twice when git-write-tree tries to write it out. Prevent it. -* +* * If ok-to-replace is specified, we remove the conflicting entries * from the cache so the caller should recompute the insert position. * When this happens, we return non-zero.
@@ -970,8 +970,8 @@ static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len) write_buffer_len = buffered; len -= partial; data = (char *) data + partial; - } -return 0 ; + } +return 0 ; } static int write_index_ext_header(SHA_CTX *context, int fd,
@@ -1037,7 +1037,7 @@ static void ce_smudge_racily_clean_entry(struct cache_entry *ce)* size to zero here, then the object name recorded * in index is the 6-byte file but the cached stat information * becomes zero --- which would then match what we would -* obtain from the filesystem next time we stat("frotz"). +* obtain from the filesystem next time we stat("frotz"). * * However, the second update-index, before calling * this function, notices that the cached size is 6
setup.c +2 -2
@@ -39,7 +39,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)if (len) {int speclen =strlen (path);char *n =xmalloc (speclen + len +1 ); - +memcpy (n, prefix, len);memcpy (n + len, path, speclen+1 ); path = n;
@@ -47,7 +47,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)return path; } -/* +/* * Unlike prefix_path, this should be used if the named file does * not have to interact with index entry; i.e. name of a random file * on the filesystem.
sha1_file.c +4 -4
@@ -193,7 +193,7 @@ char *sha1_pack_name(const unsigned char *sha1) *buf++ = hex[val >>4 ]; *buf++ = hex[val &0xf ]; } - +return base; }
@@ -218,7 +218,7 @@ char *sha1_pack_index_name(const unsigned char *sha1) *buf++ = hex[val >>4 ]; *buf++ = hex[val &0xf ]; } - +return base; }
@@ -1109,7 +1109,7 @@ static int parse_sha1_header(const char *hdr, unsigned long *sizep)unsigned long size;/* -* The type can be at most ten bytes (including the +* The type can be at most ten bytes (including the * terminating '\0' that we add), and is followed by * a space. */
@@ -1683,7 +1683,7 @@ static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e, consreturn 0 ; } -struct packed_git *find_sha1_pack (const unsigned char *sha1, +struct packed_git *find_sha1_pack (const unsigned char *sha1,struct packed_git *packs) {struct packed_git *p;
shallow.c +0 -1
@@ -101,4 +101,3 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,return result; } -
ssh-upload.c +5 -5
@@ -29,24 +29,24 @@ static int serve_object(int fd_in, int fd_out) { }if (!size)return -1 ; - +if (verbose)fprintf (stderr,"Serving %s\n" ,sha1_to_hex (sha1)); remote =0 ; - +if (!has_sha1_file (sha1)) {fprintf (stderr,"git-ssh-upload: could not find %s\n" ,sha1_to_hex (sha1)); remote =-1 ; } - +if (write_in_full (fd_out, &remote,1 ) !=1 )return 0 ; - +if (remote <0 )return 0 ; - +return write_sha1_to_fd (fd_out, sha1); }
strbuf.c +0 -1
@@ -39,4 +39,3 @@ void read_line(struct strbuf *sb, FILE *fp, int term) { sb->eof =1 ;strbuf_end (sb); } -
tree-walk.c +0 -1
@@ -206,4 +206,3 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned chfree (tree);return retval; } -
upload-pack.c +1 -1
@@ -678,7 +678,7 @@ int main(int argc, char **argv)break ; } } - +if (i != argc-1 )usage (upload_pack_usage); dir = argv[i];
var.c +2 -2
@@ -67,8 +67,8 @@ int main(int argc, char **argv) val =read_var (argv[1 ]);if (!val)usage (var_usage); - +printf ("%s\n" , val); - +return 0 ; }
xdiff-interface.c +0 -2
@@ -121,5 +121,3 @@ int read_mmfile(mmfile_t *ptr, const char *filename) ptr->size = sz;return 0 ; } - -
xdiff/xdiffi.c +0 -1
@@ -565,4 +565,3 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,return 0 ; } -
xdiff/xemit.c +0 -1
@@ -194,4 +194,3 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,return 0 ; } -
xdiff/xprepare.c +0 -1
@@ -466,4 +466,3 @@ static int xdl_optimize_ctxs(xdfile_t *xdf1, xdfile_t *xdf2) {return 0 ; } -
xdiff/xutils.c +0 -1
@@ -380,4 +380,3 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,return 0 ; } -
Signature · 1 line
1.5.2.rc3.90.gf33e-dirty
Your MUA seem to have munged all your patches in this series; and the breakage seems also to be in the "let apply eat the new trailing blank lines" patch.
Quoted 4 lines · Junio C Hamano
Your MUA seem to have munged all your patches in this series; and the breakage seems also to be in the "let apply eat the new trailing blank lines" patch.
I'm very sorry about this. I have set maximum length to 120 chars in Thunderbird, but probably there's something more to tweak.
I can resend all the patches next week-end if you want. But please feel free to create and apply the patches yourself when you prefer. I understand that this kind of patches are mostly automatically created and also touch a lot of files so the manteiner has the best _timing_ to create and apply them.
Marco
Quoted 4 lines · Marco Costalba
... I
understand that this kind of patches are mostly automatically created and also touch a lot of files so the manteiner has the best _timing_ to create and apply them.
I was thinking about the same thing last night. The tips of 'master' branch and 'next' branch were identical after pushing out the "first batch" I announced in the last "What's cooking" message, and it was really a good time to do this kind of thing.
Will do, sometime soon.