diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-10 12:33:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 12:33:20 -0700 |
| commit | 11b53957ac81dc31668a1d8fe65d19d5f60dd501 (patch) | |
| tree | e479fc638095c27aabc0245df55b7771b215bbd3 /submodule-config.h | |
| parent | 1a5f1a3f256a53014e5b832e1281d952ec5f9ef7 (diff) | |
| parent | 967d7f898c30bad41824c3f77962266b7cd7be32 (diff) | |
| download | git-11b53957ac81dc31668a1d8fe65d19d5f60dd501.tar.gz git-11b53957ac81dc31668a1d8fe65d19d5f60dd501.tar.xz | |
Merge branch 'sb/submodule-update-dot-branch'
A few updates to "git submodule update".
Use of "| wc -l" break with BSD variant of 'wc'.
* sb/submodule-update-dot-branch:
t7406: fix breakage on OSX
submodule update: allow '.' for branch value
submodule--helper: add remote-branch helper
submodule-config: keep configured branch around
submodule--helper: fix usage string for relative-path
submodule update: narrow scope of local variable
submodule update: respect depth in subsequent fetches
t7406: future proof tests with hard coded depth
Diffstat (limited to 'submodule-config.h')
| -rw-r--r-- | submodule-config.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/submodule-config.h b/submodule-config.h index b1fdcc0c3..d05c542d2 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -15,6 +15,7 @@ struct submodule { const char *url; int fetch_recurse; const char *ignore; + const char *branch; struct submodule_update_strategy update_strategy; /* the sha1 blob id of the responsible .gitmodules file */ unsigned char gitmodules_sha1[20]; |