@matheusbsbs / matheus-bagliano / commits / 9eca701f69

git-submodule.sh: rename unused variables

The 'mode' variable is not used in cmd_update for its original purpose, rename it to 'dummy' as it only serves the purpose to abort quickly documenting this knowledge. The variable 'stage' is also not used any more in cmd_update, so remove it. This went unnoticed as first each function used the commonly used submodule listing, which was converted in 74703a1e4df (submodule: rewrite `module_list` shell function in C, 2015-09-02). When cmd_update was using its own function starting in 48308681b07 (git submodule update: have a dedicated helper for cloning, 2016-02-29), its removal was missed. A later patch in this series also touches the communication between the submodule helper and git-submodule.sh, but let's have this as a preparatory patch, as it eases the next patch, which stores the raw data instead of the line printed for this communication. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Stefan Beller committed Aug 3, 2018 at 15:23 UTC 9eca701f69b1dfb857a0445ba8a78e2445e9aa2b
2 files changed +4 -5
builtin/submodule--helper.c
+2 -3
@@ -1573,9 +1573,8 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
1573 needs_cloning = !file_exists(sb.buf);
1574
1575 strbuf_reset(&sb);
1576 - strbuf_addf(&sb, "%06o %s %d %d\t%s\n", ce->ce_mode,
1577 - oid_to_hex(&ce->oid), ce_stage(ce),
1578 - needs_cloning, ce->name);
1576 + strbuf_addf(&sb, "dummy %s %d\t%s\n",
1577 + oid_to_hex(&ce->oid), needs_cloning, ce->name);
1578 string_list_append(&suc->projectlines, sb.buf);
1579
1580 if (!needs_cloning)
git-submodule.sh
+2 -2
@@ -531,9 +531,9 @@ cmd_update()
531 "$@" || echo "#unmatched" $?
532 } | {
533 err=
534 - while read -r mode sha1 stage just_cloned sm_path
534 + while read -r quickabort sha1 just_cloned sm_path
535 do
536 - die_if_unmatched "$mode" "$sha1"
536 + die_if_unmatched "$quickabort" "$sha1"
537
538 name=$(git submodule--helper name "$sm_path") || exit
539 if ! test -z "$update"