git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefan Beller <sbeller@google.com>
To: sbeller@google.com
Cc: git@vger.kernel.org, bmwill@google.com, novalis@novalis.org,
	sandals@crustytoothpaste.net, hvoigt@hvoigt.net,
	gitster@pobox.com, jrnieder@gmail.com,
	ramsay@ramsayjones.plus.com
Subject: [PATCH 04/18] lib-submodule-update.sh: replace sha1 by hash
Date: Wed,  1 Mar 2017 16:47:45 -0800	[thread overview]
Message-ID: <20170302004759.27852-5-sbeller@google.com> (raw)
In-Reply-To: <20170302004759.27852-1-sbeller@google.com>

Cleaning up code by generalising it.
Currently the mailing list discusses yet again how
to migrate away from sha1.

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 t/lib-submodule-update.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
index a906c92cfb..83202c54fc 100755
--- a/t/lib-submodule-update.sh
+++ b/t/lib-submodule-update.sh
@@ -171,9 +171,9 @@ reset_work_tree_to () {
 		git checkout -f "$1" &&
 		git status -u -s >actual &&
 		test_must_be_empty actual &&
-		sha1=$(git rev-parse --revs-only HEAD:sub1) &&
-		if test -n "$sha1" &&
-		   test $(cd "../submodule_update_sub1" && git rev-parse --verify "$sha1^{commit}")
+		hash=$(git rev-parse --revs-only HEAD:sub1) &&
+		if test -n "$hash" &&
+		   test $(cd "../submodule_update_sub1" && git rev-parse --verify "$hash^{commit}")
 		then
 			git submodule update --init --recursive "sub1"
 		fi
-- 
2.12.0.rc1.52.ge239d7e709.dirty


  parent reply	other threads:[~2017-03-02  0:56 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20170223225735.10994-1-sbeller@google.com/>
2017-03-02  0:47 ` [RFCv6 PATCH 00/18] Checkout aware of Submodules! Stefan Beller
2017-03-02  0:47   ` [PATCH 01/18] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-02  0:47   ` [PATCH 02/18] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-02  0:47   ` [PATCH 03/18] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-02  2:11     ` Eric Wong
2017-03-06 20:30       ` Stefan Beller
2017-03-06 20:35         ` Stefan Beller
2017-03-02  0:47   ` Stefan Beller [this message]
2017-03-02  0:47   ` [PATCH 05/18] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-02  0:47   ` [PATCH 06/18] make is_submodule_populated gently Stefan Beller
2017-03-02  0:47   ` [PATCH 07/18] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-02  0:47   ` [PATCH 08/18] update submodules: add submodule config parsing Stefan Beller
2017-03-02  0:47   ` [PATCH 09/18] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-02  0:47   ` [PATCH 10/18] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-02  0:47   ` [PATCH 11/18] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-02  0:47   ` [PATCH 12/18] update submodules: add submodule_move_head Stefan Beller
2017-03-02  0:47   ` [PATCH 13/18] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-02  0:47   ` [PATCH 14/18] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-02  0:47   ` [PATCH 15/18] read-cache, remove_marked_cache_entries: wipe selected submodules Stefan Beller
2017-03-02  0:47   ` [PATCH 16/18] entry.c: update submodules when interesting Stefan Beller
2017-03-02  0:47   ` [PATCH 17/18] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-02  0:47   ` [PATCH 18/18] builtin/read-tree: " Stefan Beller
2017-03-06 20:59   ` [RFCv7 PATCH 00/18] Checkout aware of Submodules! Stefan Beller
2017-03-06 20:59     ` [PATCH 01/18] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-06 20:59     ` [PATCH 02/18] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-06 20:59     ` [PATCH 03/18] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-06 22:21       ` Junio C Hamano
2017-03-06 20:59     ` [PATCH 04/18] lib-submodule-update.sh: replace sha1 by hash Stefan Beller
2017-03-06 20:59     ` [PATCH 05/18] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-07 22:26       ` Junio C Hamano
2017-03-06 20:59     ` [PATCH 06/18] make is_submodule_populated gently Stefan Beller
2017-03-06 20:59     ` [PATCH 07/18] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-06 20:59     ` [PATCH 08/18] update submodules: add submodule config parsing Stefan Beller
2017-03-06 20:59     ` [PATCH 09/18] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-06 20:59     ` [PATCH 10/18] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-06 20:59     ` [PATCH 11/18] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-06 20:59     ` [PATCH 12/18] update submodules: add submodule_move_head Stefan Beller
2017-03-06 20:59     ` [PATCH 13/18] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-06 20:59     ` [PATCH 14/18] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-06 20:59     ` [PATCH 15/18] read-cache, remove_marked_cache_entries: wipe selected submodules Stefan Beller
2017-03-07 22:42       ` Junio C Hamano
2017-03-07 23:37         ` Stefan Beller
2017-03-08  1:14           ` Junio C Hamano
2017-03-08 22:39             ` Stefan Beller
2017-03-08 23:37               ` Junio C Hamano
2017-03-06 20:59     ` [PATCH 16/18] entry.c: update submodules when interesting Stefan Beller
2017-03-07 22:42       ` Junio C Hamano
2017-03-07 23:04         ` Junio C Hamano
2017-03-07 23:08           ` Stefan Beller
2017-03-08  1:08             ` Junio C Hamano
2017-03-06 20:59     ` [PATCH 17/18] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-06 20:59     ` [PATCH 18/18] builtin/read-tree: " Stefan Beller
2017-03-07 22:42       ` Junio C Hamano
2017-03-09 22:15     ` [RFCv8 PATCH 00/17] Checkout aware of Submodules! Stefan Beller
2017-03-09 22:15       ` [PATCH 01/17] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-09 22:15       ` [PATCH 02/17] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-09 22:15       ` [PATCH 03/17] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-09 22:15       ` [PATCH 04/17] lib-submodule-update.sh: replace sha1 by hash Stefan Beller
2017-03-09 22:15       ` [PATCH 05/17] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-09 22:15       ` [PATCH 06/17] make is_submodule_populated gently Stefan Beller
2017-03-09 22:15       ` [PATCH 07/17] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-09 23:29         ` Brandon Williams
2017-03-12  7:06           ` Junio C Hamano
2017-03-09 22:15       ` [PATCH 08/17] update submodules: add submodule config parsing Stefan Beller
2017-03-09 22:15       ` [PATCH 09/17] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-09 22:15       ` [PATCH 10/17] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-09 22:15       ` [PATCH 11/17] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-09 22:15       ` [PATCH 12/17] update submodules: add submodule_move_head Stefan Beller
2017-03-09 23:37         ` Brandon Williams
2017-03-12  7:09           ` Junio C Hamano
2017-03-13 17:24             ` Brandon Williams
2017-03-13 20:50             ` Stefan Beller
2017-03-09 23:40         ` Brandon Williams
2017-03-09 23:43         ` Brandon Williams
2017-03-09 22:15       ` [PATCH 13/17] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-09 22:15       ` [PATCH 14/17] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-09 22:15       ` [PATCH 15/17] entry.c: create submodules when interesting Stefan Beller
2017-03-09 22:15       ` [PATCH 16/17] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-09 22:15       ` [PATCH 17/17] builtin/read-tree: " Stefan Beller
2017-03-14 21:46       ` [PATCHv9 00/19] Checkout aware of Submodules! Stefan Beller
2017-03-14 21:46         ` [PATCH 01/19] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-14 21:46         ` [PATCH 02/19] submodule--helper.c: remove duplicate code Stefan Beller
2017-03-14 21:46         ` [PATCH 03/19] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-14 21:46         ` [PATCH 04/19] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-14 21:46         ` [PATCH 05/19] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-14 21:46         ` [PATCH 06/19] lib-submodule-update.sh: replace sha1 by hash Stefan Beller
2017-03-14 21:46         ` [PATCH 07/19] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-14 21:46         ` [PATCH 08/19] make is_submodule_populated gently Stefan Beller
2017-03-14 21:46         ` [PATCH 09/19] update submodules: add submodule config parsing Stefan Beller
2017-03-14 21:46         ` [PATCH 10/19] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-14 21:46         ` [PATCH 11/19] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-14 21:46         ` [PATCH 12/19] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-14 21:46         ` [PATCH 13/19] submodule.c: get_super_prefix_or_empty Stefan Beller
2017-03-14 21:46         ` [PATCH 14/19] update submodules: add submodule_move_head Stefan Beller
2017-03-14 21:46         ` [PATCH 15/19] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-14 21:46         ` [PATCH 16/19] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-14 21:46         ` [PATCH 17/19] entry.c: create submodules when interesting Stefan Beller
2017-03-14 21:46         ` [PATCH 18/19] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-14 21:46         ` [PATCH 19/19] builtin/read-tree: " Stefan Beller
2017-03-15  0:41         ` [PATCHv9 00/19] Checkout aware of Submodules! Brandon Williams

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170302004759.27852-5-sbeller@google.com \
    --to=sbeller@google.com \
    --cc=bmwill@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hvoigt@hvoigt.net \
    --cc=jrnieder@gmail.com \
    --cc=novalis@novalis.org \
    --cc=ramsay@ramsayjones.plus.com \
    --cc=sandals@crustytoothpaste.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).