to generate
the list of prerequisite patch ids. Clear UNINTERESTING flag with
clear_object_flags solves this issue.
Reported-by: Eduardo Habkost
Signed-off-by: Xiaolong Ye
---
builtin/log.c | 1 +
t/t4014-format-patch.sh | 6 --
2 files changed, 5 insertions(+), 2 deletions(-
command line
option.
Signed-off-by: Xiaolong Ye
---
Documentation/config.txt | 5 +
builtin/log.c| 17 +++--
t/t4014-format-patch.sh | 19 +++
3 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/Documentation/config.txt b/Documentation
Introduce --base=auto to record the base commit info automatically, the
base_commit will be the merge base of tip commit of the upstream branch
and revision-range specified in cmdline.
Helped-by: Junio C Hamano
Helped-by: Wu Fengguang
Signed-off-by: Xiaolong Ye
---
Documentation/git-format
Make commit_patch_id() available to other builtins.
Signed-off-by: Xiaolong Ye
---
patch-ids.c | 2 +-
patch-ids.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/patch-ids.c b/patch-ids.c
index b7b3e5a..a4d0016 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -4,7 +4,7
Thanks for Junio's reviews and suggestions.
This version contains the following changes since v5:
- Fix a decl-after-statement in patch 3/4.
- Improve testcases to cover more scenarios and make them more portable and
readable.
Thanks,
Xiaolong
Xiaolong Ye (4):
patch-ids:
at the end of the
first message the command outputs (either the first patch, or the
cover letter), like this:
base-commit: P
prerequisite-patch-id: X
prerequisite-patch-id: Y
prerequisite-patch-id: Z
Helped-by: Junio C Hamano
Helped-by: Wu Fengguang
Signed-off-by: Xiaolong Ye
---
Documentat
Introduce --base=auto to record the base commit info automatically, the
base_commit will be the merge base of tip commit of the upstream branch
and revision-range specified in cmdline.
Helped-by: Junio C Hamano
Helped-by: Wu Fengguang
Signed-off-by: Xiaolong Ye
---
Documentation/git-format
at the end of the
first message the command outputs (either the first patch, or the
cover letter), like this:
base-commit: P
prerequisite-patch-id: X
prerequisite-patch-id: Y
prerequisite-patch-id: Z
Helped-by: Junio C Hamano
Helped-by: Wu Fengguang
Signed-off-by: Xiaolong Ye
---
Documentat
command line
option.
Signed-off-by: Xiaolong Ye
---
Documentation/config.txt | 5 +
builtin/log.c| 17 +++--
t/t4014-format-patch.sh | 18 ++
3 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
Make commit_patch_id() available to other builtins.
Helped-by: Junio C Hamano
Signed-off-by: Xiaolong Ye
---
patch-ids.c | 2 +-
patch-ids.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/patch-ids.c b/patch-ids.c
index b7b3e5a..a4d0016 100644
--- a/patch-ids.c
+++ b
e repeated pair-wise computation to get the merge base for the
validation of base commit.
- Extract "auto handling thing" from prepare_bases and put it into
get_base_commit.
- Use format.useAutoBase boolean variable for the auto configuration
in format section.
Thanks,
Xiaol
passed to command line option.
Signed-off-by: Xiaolong Ye
---
Documentation/git-format-patch.txt | 4
builtin/log.c | 21 ++---
t/t4014-format-patch.sh| 19 +++
3 files changed, 37 insertions(+), 7 deletions(-)
diff --git a
Introduce --base=auto to record the base commit info automatically, the
base_commit will be the merge base of tip commit of the upstream branch
and revision-range specified in cmdline.
Helped-by: Junio C Hamano
Helped-by: Wu Fengguang
Signed-off-by: Xiaolong Ye
---
Documentation/git-format
Make commit_patch_id() available to other builtins.
Helped-by: Junio C Hamano
Signed-off-by: Xiaolong Ye
---
patch-ids.c | 2 +-
patch-ids.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/patch-ids.c b/patch-ids.c
index b7b3e5a..a4d0016 100644
--- a/patch-ids.c
+++ b
n block showing at the
end of _first_ message as below:
base-commit: P
prerequisite-patch-id: X
prerequisite-patch-id: Y
prerequisite-patch-id: Z
Helped-by: Junio C Hamano
Helped-by: Wu Fengguang
Signed-off-by: Xiaolong Ye
---
Documentation/git-format-patch.txt | 56
tests for the --base option and format.base configuration.
- Fix a segfault error due to bases structure hasn't been initialized when
--base option is not set, Thanks for Ramsay's report.
Xiaolong Ye (4):
patch-ids: make commit_patch_id() a public helper function
format-pat
Make commit_patch_id() available to other builtins.
Helped-by: Junio C Hamano
Signed-off-by: Xiaolong Ye
---
patch-ids.c | 2 +-
patch-ids.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/patch-ids.c b/patch-ids.c
index b7b3e5a..a4d0016 100644
--- a/patch-ids.c
+++ b
passed to command line option.
Signed-off-by: Xiaolong Ye
---
Documentation/git-format-patch.txt | 2 ++
builtin/log.c | 21 ++---
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-format-patch.txt
b/Documentation/git-format
Introduce --base=auto to record the base commit info automatically, the
base_commit
will be the merge base of tip commit of the upstream branch and revision-range
specified in cmdline.
Helped-by: Junio C Hamano
Helped-by: Wu Fengguang
Signed-off-by: Xiaolong Ye
---
Documentation/git-format
no upstream, we just
error out and suggest to use set-upstream-to to track a remote branch
as upstream.
v1 can be found here:
http://article.gmane.org/gmane.comp.version-control.git/286873
v2 can be found here:
http://article.gmane.org/gmane.comp.version-control.git/289603
Xiaolong Ye (4):
the series).
Helped-by: Junio C Hamano
Helped-by: Wu Fengguang
Signed-off-by: Xiaolong Ye
---
Documentation/git-format-patch.txt | 25 +++
builtin/log.c | 89 ++
2 files changed, 114 insertions(+)
diff --git a/Documentation/git-format-pa
the series).
Signed-off-by: Xiaolong Ye
---
Documentation/git-format-patch.txt | 15 ++
builtin/log.c | 98 ++
2 files changed, 113 insertions(+)
diff --git a/Documentation/git-format-patch.txt
b/Documentation/git-format-patch.txt
ind
Introduce --base=auto to record the base commit info automatically, the
base_commit
will be the tip commit of the upstream branch. If upstream branch cannot be
determined,
it will just record the parent's commit id and patch id.
Signed-off-by: Xiaolong Ye
---
builtin/log.c
Make commit_patch_id() available to other builtins.
Signed-off-by: Xiaolong Ye
---
patch-ids.c | 2 +-
patch-ids.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/patch-ids.c b/patch-ids.c
index b7b3e5a..a4d0016 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -4,7 +4,7
passed to command line option.
Signed-off-by: Xiaolong Ye
---
Documentation/git-format-patch.txt | 5 +
builtin/log.c | 21 ++---
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-format-patch.txt
b/Documentation/git-format
parent-commit: ab5d01a29eb7380ceab070f0807c2939849c44bc
parent-patch-id: caf2dae24db5b4c49a6c4134dd6d9908e898424b
Thanks for fengguang and junio's suggestions and prototype of implementation.
Thanks,
Xiaolong.
Xiaolong Ye (4):
patch-ids: make commit_patch_id() a public helper function
format-patch: a
It would be helpful for maintainers or reviewers to know the base tree
info of the patches created by git format-patch. Teach git format-patch
a --base-tree-info option to record these info.
Signed-off-by: Xiaolong Ye
---
builtin/log.c | 18 ++
diff.c| 4
diff.h
th cover letter
you could see the commit id at the bottom of the message.
2) without cover letter
Signed-off-by: Xiaolong Ye
---
builtin/log.c | 17 +
diff.c| 4
diff.h| 3 ++-
revision.h| 1 +
28 matches
Mail list logo
