Re: [RFC/PATCH 2/4] Restructuring git-merge.sh
From: Jakub Narebski <hidden>
Date: 2016-06-15 22:44:25
"Sverre Hvammen Johansen" [off-list ref] writes:
for preparation of new feature:
A bit of nit-picking: I'd like to have full sentences in commit message (in the commit description); continuing first line isn't the best style, IMHO. I'd write instead the following: Restructure git-merge.sh, adding find_real_parents() function, in preparation for new feature:
quoted hunk ↗ jump to hunk
Head reduction before selecting merge strategy Signed-off-by: Sverre Hvammen Johansen <redacted> --- git-merge.sh | 166 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 85 insertions(+), 81 deletions(-)diff --git a/git-merge.sh b/git-merge.sh index 17f40f2..2acd2cc 100755 --- a/git-merge.sh +++ b/git-merge.sh@@ -207,6 +207,29 @@ parse_config () { args_left=$# } +# Find real parents +# Set the following variables as followd: +# real_parents: The parents specified on the command line
Not specified_parents, or arg_parents?
+# common: All common ancestors or not_queried
+# ff_head: Fast forward of head
+find_real_parents () {Very nice.
+ real_parents=$(git rev-parse "$@")
+ real_parents=${real_parents#$LF}Why this trick with adding $LF? -- Jakub Narebski Poland ShadeHawk on #git