merge(third_party/git): Merge squashed git subtree at v2.23.0 r/373

Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'

1 files changed, 58 insertions, 0 deletions

diff --git a/third_party/git/t/t3500-cherry.sh b/third_party/git/t/t3500-cherry.sh
new file mode 100755
index 000000000000..f038f34b7c03
--- /dev/null
+++ b/third_party/git/t/t3500-cherry.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Yann Dirson, based on t3400 by Amos Waterland
+#
+
+test_description='git cherry should detect patches integrated upstream
+
+This test cherry-picks one local change of two into master branch, and
+checks that git cherry only returns the second patch in the local branch
+'
+. ./test-lib.sh
+
+GIT_AUTHOR_EMAIL=bogus_email_address
+export GIT_AUTHOR_EMAIL
+
+test_expect_success \
+    'prepare repository with topic branch, and check cherry finds the 2 patches from there' \
+    'echo First > A &&
+     git update-index --add A &&
+     test_tick &&
+     git commit -m "Add A." &&
+
+     git checkout -b my-topic-branch &&
+
+     echo Second > B &&
+     git update-index --add B &&
+     test_tick &&
+     git commit -m "Add B." &&
+
+     echo AnotherSecond > C &&
+     git update-index --add C &&
+     test_tick &&
+     git commit -m "Add C." &&
+
+     git checkout -f master &&
+     rm -f B C &&
+
+     echo Third >> A &&
+     git update-index A &&
+     test_tick &&
+     git commit -m "Modify A." &&
+
+     expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*"
+'
+
+test_expect_success \
+    'check that cherry with limit returns only the top patch'\
+    'expr "$(echo $(git cherry master my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
+'
+
+test_expect_success \
+    'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new' \
+    'git cherry-pick my-topic-branch^0 &&
+     echo $(git cherry master my-topic-branch) &&
+     expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* - .*"
+'
+
+test_done