Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint-1.7.5' into maint-1.7.6
author
Junio C Hamano
<gitster@pobox.com>
Wed, 26 Oct 2011 23:08:19 +0000
(16:08 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 26 Oct 2011 23:08:19 +0000
(16:08 -0700)
* maint-1.7.5:
make the sample pre-commit hook script reject names with newlines, too
Reindent closing bracket using tab instead of spaces
Documentation/git-update-index: refer to 'ls-files'
1
2
wt-status.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
compact
(merge:
6320526
69d61da
)
diff --combined
wt-status.c
index 02377729c401fa6e041a713a89fe986fa0f562a0,227622d154f12540ddc3e231fbbcb831e07c0a77..c01838c5ad5d04996478350c01a9c49231a467bc
---
1
/
wt-status.c
---
2
/
wt-status.c
+++ b/
wt-status.c
@@@
-394,7
-394,7
+394,7
@@@
static void wt_status_collect_changes_w
if (s->ignore_submodule_arg) {
DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
- }
+
}
rev.diffopt.format_callback = wt_status_collect_changed_cb;
rev.diffopt.format_callback_data = s;
init_pathspec(&rev.prune_data, s->pathspec);
@@@
-642,7
-642,7
+642,7
@@@
static void wt_status_print_other(struc
int i;
struct strbuf buf = STRBUF_INIT;
- if (!
s->untracked.
nr)
+ if (!
l->
nr)
return;
wt_status_print_other_header(s, what, how);