global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-15 03:00:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'jc/archive' and 'jk/diff' into next

Browse Source 
* jc/archive:
  git-archive: inline default_parse_extra()

* jk/diff:
  wt-status: remove extraneous newline from 'deleted:' output
This commit is contained in:
Junio C Hamano
2006-09-14 00:05:00 -07:00
parent 8565d94621 2232c0c69f db830b4f23
commit cd6f102cec
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
builtin-archive.c
View File

@@ -145,17 +145,6 @@ void parse_treeish_arg(const char **argv, struct archiver_args *ar_args,
ar_args->time = archive_time;
}
static const char *default_parse_extra(struct archiver *ar,
const char **argv)
{
static char msg[64];
snprintf(msg, sizeof(msg) - 4, "'%s' format does not handle %s",
ar->name, *argv);
return strcat(msg, "...");
}
int parse_archive_args(int argc, const char **argv, struct archiver *ar)
{
const char *extra_argv[MAX_EXTRA_ARGS];
@@ -208,7 +197,8 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar)
if (extra_argc) {
if (!ar->parse_extra)
die("%s", default_parse_extra(ar, extra_argv));
die("'%s' format does not handle %s",
ar->name, extra_argv[0]);
ar->args.extra = ar->parse_extra(extra_argc, extra_argv);
}
ar->args.verbose = verbose;

2
wt-status.c
View File

@@ -78,7 +78,7 @@ static void wt_status_print_filepair(int t, struct diff_filepair *p)
p->one->path, p->two->path);
break;
case DIFF_STATUS_DELETED:
color_printf_ln(c, "deleted: %s", p->one->path); break;
color_printf(c, "deleted: %s", p->one->path); break;
case DIFF_STATUS_MODIFIED:
color_printf(c, "modified: %s", p->one->path); break;
case DIFF_STATUS_RENAMED: