mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tk/stripspace'

Browse Source 
The internal stripspace() function has been moved to where it
logically belongs to, i.e. strbuf API, and the command line parser
of "git stripspace" has been updated to use the parse_options API.

* tk/stripspace:
  stripspace: use parse-options for command-line parsing
  strbuf: make stripspace() part of strbuf
This commit is contained in:
Junio C Hamano
2015-10-26 15:55:20 -07:00
parent 0884726b43 bed4452468
commit 1ad7c0f689
9 changed files with 115 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/notes.c
View File

@ -192,7 +192,7 @@ static void prepare_note_data(const unsigned char *object, struct note_data *d,
if (launch_editor(d->edit_path, &d->buf, NULL)) {
die(_("Please supply the note contents using either -m or -F option"));
}
stripspace(&d->buf, 1);
strbuf_stripspace(&d->buf, 1);
}
}
@ -215,7 +215,7 @@ static int parse_msg_arg(const struct option *opt, const char *arg, int unset)
if (d->buf.len)
strbuf_addch(&d->buf, '\n');
strbuf_addstr(&d->buf, arg);
stripspace(&d->buf, 0);
strbuf_stripspace(&d->buf, 0);
d->given = 1;
return 0;
@ -232,7 +232,7 @@ static int parse_file_arg(const struct option *opt, const char *arg, int unset)
die_errno(_("cannot read '%s'"), arg);
} else if (strbuf_read_file(&d->buf, arg, 1024) < 0)
die_errno(_("could not open or read '%s'"), arg);
stripspace(&d->buf, 0);
strbuf_stripspace(&d->buf, 0);
d->given = 1;
return 0;