summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-06 18:39:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-06 18:39:11 (GMT)
commitaad627e3c0e7dcf5a59da80cb424e8a4093b0324 (patch)
tree6de618e5e855a985e42e6020eff41c59123699e1 /t/t7600-merge.sh
parenta6822e4172a8fa889b10a7a363088d2a05932b9b (diff)
parentb84e65d40929ec1146f54dcf4c9dbf8dc58467d0 (diff)
downloadgit-aad627e3c0e7dcf5a59da80cb424e8a4093b0324.zip
git-aad627e3c0e7dcf5a59da80cb424e8a4093b0324.tar.gz
git-aad627e3c0e7dcf5a59da80cb424e8a4093b0324.tar.bz2
Merge branch 'jv/merge-nothing-into-void'
"git merge FETCH_HEAD" dereferenced NULL pointer when merging nothing into an unborn history (which is arguably unusual usage, which perhaps was the reason why nobody noticed it). * jv/merge-nothing-into-void: merge: fix NULL pointer dereference when merging nothing into void
Diffstat (limited to 't/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index dc9f142..85248a1 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -753,4 +753,14 @@ test_expect_success 'merge detects mod-256 conflicts (resolve)' '
test_must_fail git merge -s resolve master
'
+test_expect_success 'merge nothing into void' '
+ git init void &&
+ (
+ cd void &&
+ git remote add up .. &&
+ git fetch up &&
+ test_must_fail git merge FETCH_HEAD
+ )
+'
+
test_done