On 12-10-20, Herman van Rink wrote:
On 10/19/2012 03:21 PM, Yann Dirson wrote:
As the examples in git-subtree.txt show, the synopsis in the same file
should
surely get a patch along the lines of:
-'git subtree' add -P prefix commit
+'git subtree' add -P prefix repository commit
2013/1/13 Techlive Zheng techlivezh...@gmail.com:
Mostly prepare for the later tests refactoring.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
I am personally a SP-indenting guy, I did not aware of Git's indenting
policy until now, so it is bad that I replaced all the lines initially
David A. Greene (1):
contrib/subtree: Remove test number comments
Techlive Zheng (7):
contrib/subtree: Fix whitespaces
contrib/subtree: Add vim modeline
contrib/subtree: Ignore testing directory
contrib/subtree: Code cleaning and refactoring
contrib/subtree: Make each test self
Previous code does not fulfill Git's whitespace policy.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/git-subtree.sh | 68
contrib/subtree/git-subtree.txt| 42 ++---
contrib/subtree/t/t7900-subtree.sh | 314 ++---
3
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/git-subtree.sh | 2 ++
contrib/subtree/t/t7900-subtree.sh | 2 ++
2 files changed, 4 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 70f86ea..88903c0 100755
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/.gitignore | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore
index 91360a3..59aeeb4 100644
--- a/contrib/subtree/.gitignore
+++ b/contrib
From: David A. Greene gree...@obbligato.org
Delete the comments indicating test numbers as it causes maintenance
headaches. t*.sh -i will help us find any broken tests.
Signed-off-by: David A. Greene gree...@obbligato.org
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib
Mostly prepare for the later tests refactoring.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/t/t7900-subtree.sh | 251 +++--
1 file changed, 130 insertions(+), 121 deletions(-)
diff --git a/contrib/subtree/t/t7900-subtree.sh
b
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/t/t7900-subtree.sh | 865 ++---
1 file changed, 614 insertions(+), 251 deletions(-)
diff --git a/contrib/subtree/t/t7900-subtree.sh
b/contrib/subtree/t/t7900-subtree.sh
index 69bd41c
option could help.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/git-subtree.sh | 13 ++-
contrib/subtree/git-subtree.txt| 13 +++
contrib/subtree/t/t7900-subtree.sh | 47
'git subtree merge' will fail if the argument of '--prefix' has a slash
appended.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/git-subtree.sh | 2 +-
contrib/subtree/t/t7900-subtree.sh | 19 +++
2 files changed, 20 insertions(+), 1 deletion
comments
Techlive Zheng (6):
contrib/subtree: Add vim modeline
contrib/subtree: Ignore testing directory
contrib/subtree: Code cleaning and refactoring
contrib/subtree: Make each test self-contained
contrib/subtree: Use %B for the split commit message
contrib/subtree: Handle '--prefix
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/git-subtree.sh | 2 ++
contrib/subtree/t/t7900-subtree.sh | 2 ++
2 files changed, 4 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 920c664..138e1e0 100755
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/.gitignore | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore
index 91360a3..59aeeb4 100644
--- a/contrib/subtree/.gitignore
+++ b/contrib
From: David A. Greene gree...@obbligato.org
Delete the comments indicating test numbers as it causes maintenance
headaches. t*.sh -i will help us find any broken tests.
Signed-off-by: David A. Greene gree...@obbligato.org
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib
Mostly prepare for the later tests refactoring.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/git-subtree.sh | 66 -
contrib/subtree/t/t7900-subtree.sh | 283 +++--
2 files changed, 179 insertions(+), 170 deletions(-)
diff
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/t/t7900-subtree.sh | 865 ++---
1 file changed, 614 insertions(+), 251 deletions(-)
diff --git a/contrib/subtree/t/t7900-subtree.sh
b/contrib/subtree/t/t7900-subtree.sh
index bb4fd1f
'git subtree merge' will fail if the argument of '--prefix' has a slash
appended.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/git-subtree.sh | 2 +-
contrib/subtree/t/t7900-subtree.sh | 19 +++
2 files changed, 20 insertions(+), 1 deletion
2013/1/8 David A. Greene gree...@obbligato.org:
From: Techlive Zheng techlivezh...@gmail.com
Use %B to format the commit message and body to avoid an extra newline
if a commit only has a subject line.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: David A. Greene gree
2013/1/1 Junio C Hamano gits...@pobox.com:
David A. Greene gree...@obbligato.org writes:
From: Techlive Zheng techlivezh...@gmail.com
Use %B to format the commit message and body to avoid an extra newline
if a commit only has a subject line.
Is this an unconditional improvement
2013/1/1 Junio C Hamano gits...@pobox.com:
David A. Greene gree...@obbligato.org writes:
From: Techlive Zheng techlivezh...@gmail.com
Use %B to format the commit message and body to avoid an extra newline
if a commit only has a subject line.
Is this an unconditional improvement
.
Techlive Zheng (1):
subtree.sh: Use raw subject and body modifier %B instead of %s%n%n%b
contrib/subtree/git-subtree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
1.7.11.4
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
initially, the 'split' command would not genereate the same
commits as the orginal which may cause conflicts.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
contrib/subtree/git-subtree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.sh b
This test would fail at the moment.
---
t/t9300-fast-import.sh | 31 +++
1 file changed, 31 insertions(+)
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 2fcf269..2a8368e 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -1039,6
The current git-fast-import would not correctly handle such a commit stream
in which a file was deleted and at the same time a directory with the same
name was created. All paths under the newly created directory will be lost
after the importing.
---
fast-import.c | 9 +
1 file changed, 9
25 matches
Mail list logo
