Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-13 Thread Fabian Ruch
Hi, Junio C Hamano writes: > Fabian Ruch writes: >> diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh >> index d3fb67d..3f754ae 100644 >> --- a/git-rebase--merge.sh >> +++ b/git-rebase--merge.sh >> @@ -67,7 +67,13 @@ call_merge () { >> GIT_MERGE_VERBOSITY=1 && export GIT_MERGE

Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread Junio C Hamano
Fabian Ruch writes: >> The interface to "git-merge-$strategy" is designed in such a way >> that each strategy should be capable of taking _no_ base at all. > > The merge strategies "resolve" and "octopus" seem to refuse to run if no > base is specified. The former silently exits if no bases are g

Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread Fabian Ruch
Hi Junio, On 10/09/2014 09:05 PM, Junio C Hamano wrote: > Fabian Ruch writes: >> diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh >> index d3fb67d..3f754ae 100644 >> --- a/git-rebase--merge.sh >> +++ b/git-rebase--merge.sh >> @@ -67,7 +67,13 @@ call_merge () { >> GIT_MERGE_VE

Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread David M. Lloyd
On 10/09/2014 01:50 PM, Fabian Ruch wrote: Hi David, I don't think you made a mistake at all. If I understand the --merge mode of git-rebase correctly there is no need to require a parent. The error occurs when the script tries to determine the changes your merge commit introduces, which include

Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread Derek Moore
Should perhaps you be using some symbolic method of referencing the empty tree instead of referencing a magic number? E.g., https://git.wiki.kernel.org/index.php/Aliases#Obtaining_the_Empty_Tree_SHA1 On Thu, Oct 9, 2014 at 1:50 PM, Fabian Ruch wrote: > When the user specifies a merge strategy,

Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread Junio C Hamano
Fabian Ruch writes: > diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh > index d3fb67d..3f754ae 100644 > --- a/git-rebase--merge.sh > +++ b/git-rebase--merge.sh > @@ -67,7 +67,13 @@ call_merge () { > GIT_MERGE_VERBOSITY=1 && export GIT_MERGE_VERBOSITY > fi > test

[PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread Fabian Ruch
When the user specifies a merge strategy, `git-merge-$strategy` is used in non-interactive mode to replay the changes introduced by the current branch relative to some upstream. Specifically, for each commit `c` that is not in upstream the changes that led from `c^` to `c` are reapplied. If the cu