diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-17 21:57:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 21:57:58 (GMT) |
| commit | 5a7a0fae8f964b5ad179018d6a50f25ef7550f97 (patch) | |
| tree | 126f1390f83cbddc7b67b70f25348b282944a772 /builtin | |
| parent | d6b634fafdb5570d9c25d5176d3d32fe0b22530d (diff) | |
| parent | 1c7d402b3e1e9d7e50abfbfb18c88bc79be468ea (diff) | |
| download | git-5a7a0fae8f964b5ad179018d6a50f25ef7550f97.zip git-5a7a0fae8f964b5ad179018d6a50f25ef7550f97.tar.gz git-5a7a0fae8f964b5ad179018d6a50f25ef7550f97.tar.bz2 | |
Merge branch 'maint'
* maint:
clean: remove redundant variable baselen
Documentation/git-pull: clarify configuration
Document that rev-list --graph triggers parent rewriting.
clean: avoid quoting twice
document sigchain api
Keep together options controlling the behaviour of diffcore-rename.
t3402: test "rebase -s<strategy> -X<opt>"
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clean.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index c8798f5..fb24030 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -38,7 +38,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) { int i; int show_only = 0, remove_directories = 0, quiet = 0, ignored = 0; - int ignored_only = 0, baselen = 0, config_set = 0, errors = 0; + int ignored_only = 0, config_set = 0, errors = 0; int rm_flags = REMOVE_DIR_KEEP_NESTED_GIT; struct strbuf directory = STRBUF_INIT; struct dir_struct dir; @@ -138,7 +138,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (pathspec) { memset(seen, 0, argc > 0 ? argc : 1); matches = match_pathspec(pathspec, ent->name, len, - baselen, seen); + 0, seen); } if (S_ISDIR(st.st_mode)) { @@ -153,7 +153,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) printf("Removing %s\n", qname); if (remove_dir_recursively(&directory, rm_flags) != 0) { - warning("failed to remove '%s'", qname); + warning("failed to remove %s", qname); errors++; } } else if (show_only) { @@ -173,7 +173,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) printf("Removing %s\n", qname); } if (unlink(ent->name) != 0) { - warning("failed to remove '%s'", qname); + warning("failed to remove %s", qname); errors++; } } |