Skip to main content

Browse the archive

Revision cc601901a7a9619b706cb10a6fdc1e6246b6da53 authored by Junio C Hamano on 06 May 2016, 21:53:24 UTC, committed by Junio C Hamano on 06 May 2016, 21:53:25 UTC 
Merge branch 'sb/submodule-path-misc-bugs' into maint
 
"git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.

* sb/submodule-path-misc-bugs:
  t7407: make expectation as clear as possible
  submodule update: test recursive path reporting from subdirectory
  submodule update: align reporting path for custom command execution
  submodule status: correct path handling in recursive submodules
  submodule update --init: correct path handling in recursive submodules
  submodule foreach: correct path display in recursive submodules
2 parent s a0c9cf5 + 2ab5660
Raw File
t4102-apply-rename.sh 
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#

test_description='git apply handling copy/rename patch.

'
. ./test-lib.sh

# setup

cat >test-patch <<\EOF
diff --git a/foo b/bar
similarity index 47%
rename from foo
rename to bar
--- a/foo
+++ b/bar
@@ -1 +1 @@
-This is foo
+This is bar
EOF

echo 'This is foo' >foo
chmod +x foo

test_expect_success setup \
    'git update-index --add foo'

test_expect_success apply \
    'git apply --index --stat --summary --apply test-patch'

test_expect_success FILEMODE validate \
	    'test -f bar && ls -l bar | grep "^-..x......"'

test_expect_success 'apply reverse' \
    'git apply -R --index --stat --summary --apply test-patch &&
     test "$(cat foo)" = "This is foo"'

cat >test-patch <<\EOF
diff --git a/foo b/bar
similarity index 47%
copy from foo
copy to bar
--- a/foo
+++ b/bar
@@ -1 +1 @@
-This is foo
+This is bar
EOF

test_expect_success 'apply copy' \
    'git apply --index --stat --summary --apply test-patch &&
     test "$(cat bar)" = "This is bar" && test "$(cat foo)" = "This is foo"'

test_done
back to top