From: Hironao OTSUBO <motemen@gmail.com>
To: git@vger.kernel.org
Cc: greened@obbligato.org, Hironao OTSUBO <motemen@gmail.com>
Subject: [PATCH] subtree: die if failed to find existing splits
Date: Wed, 14 Feb 2018 13:38:21 +0900 [thread overview]
Message-ID: <20180214043821.13900-1-motemen@gmail.com> (raw)
When using git-subtree with --squash option, you may not have commits
indicated by git-subtree-split: at hand.
find_existing_splits dies on such situation, but the caller cmd_split
ignored it and produce unwanted output, i.e. a history that does not
contain commits from subproject. This patch fixes it.
Signed-off-by: Hironao OTSUBO <motemen@gmail.com>
---
Notes:
I know there was a discussion [1] about moving git-subtree development to
GitHub, but don't know where the actual repository is, so I am sending this
patch to the mailing list.
[1]: https://public-inbox.org/git/87mv7kf369.fsf@waller.obbligato.org/
contrib/subtree/git-subtree.sh | 2 +-
contrib/subtree/t/t7900-subtree.sh | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index dec085a23..81ad6e716 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -693,7 +693,7 @@ cmd_split () {
then
unrevs=
else
- unrevs="$(find_existing_splits "$dir" "$revs")"
+ unrevs="$(find_existing_splits "$dir" "$revs")" || die "could not find existing splits"
fi
# We can't restrict rev-list to only $dir here, because some of our
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index d05c613c9..fb3d73acf 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -493,6 +493,24 @@ test_expect_success 'split "sub dir"/ with --branch for an incompatible branch'
)
'
+next_test
+test_expect_success 'split fails without squashed commits existing' '
+ subtree_test_create_repo "$subtree_test_count" &&
+ subtree_test_create_repo "$subtree_test_count/sub proj" &&
+ test_create_commit "$subtree_test_count" main1 &&
+ test_create_commit "$subtree_test_count/sub proj" sub1 &&
+ commit1=$( cd "$subtree_test_count/sub proj" && git rev-parse HEAD ) &&
+ test_create_commit "$subtree_test_count/sub proj" sub2 &&
+ (
+ cd "$subtree_test_count" &&
+ git fetch ./"sub proj" master &&
+ git subtree add --prefix="sub dir" --squash FETCH_HEAD &&
+ git gc --prune=all &&
+ ! git rev-parse -q --verify "$commit1^{commit}" &&
+ test_must_fail git subtree split --prefix="sub dir"
+ )
+'
+
#
# Validity checking
#
--
2.16.1
reply other threads:[~2018-02-14 4:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180214043821.13900-1-motemen@gmail.com \
--to=motemen@gmail.com \
--cc=git@vger.kernel.org \
--cc=greened@obbligato.org \
/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).