On Fri, Jul 20, 2018 at 04:33:28PM +, Derrick Stolee wrote:
> The can_all_from_reach_with_flags() algorithm is currently quadratic in
> the worst case, because it calls the reachable() method for every 'from'
> without tracking which commits have already been walked or which can
> already reac
Lately I noticed that occasionally I ended up with an empty commit
message after an interactive rebase. However, since I didn't do
anything that I haven't already done countless times before, I thought
that one of my local patches touching the area where 'git commit'
calls launch_editor() got me
Currently when git-fetch is asked to recurse into submodules, it dispatches
a plain "git-fetch -C " (and some submodule related options
such as prefix and recusing strategy, but) without any information of the
remote or the tip that should be fetched.
This works surprisingly well in some workflows
This is a test of smart HTTP, so it should use the smart HTTP endpoints
(e.g. /info/refs?service=git-receive-pack), not dumb HTTP (HEAD).
Signed-off-by: Jonathan Nieder
Signed-off-by: Max Kirillov
---
> do you know why the test passes without 574c513e8d (http-backend: allow
> empty CONTENT_LEN
This is a resend of [1] and was rebased to origin/master and all review comments
have been addressed.
Thanks,
Stefan
[1] https://public-inbox.org/git/20180808221752.195419-1-sbel...@google.com/
Stefan Beller (11):
string_list: print_string_list to use trace_printf
string-list.h: add string_l
On Mon, Sep 3, 2018 at 7:31 PM, Duy Nguyen wrote:
> On Sun, Sep 2, 2018 at 9:57 AM Christian Couder
> wrote:
>>
>> Thanks for going the extra mile and doing this!
>>
>> I wonder if we should also try to make the show_list() function part
>> of the trace_*() fu
Instead of hard-coding a 40-based constant, split the output of
for-each-ref and for-each-reflog by field.
Signed-off-by: brian m. carlson
---
t/t1407-worktree-ref-store.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-re
Instead of hard-coding a 40-based constant, split the output of
for-each-ref and for-each-reflog by field.
Signed-off-by: brian m. carlson
---
t/t1406-submodule-ref-store.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodu
Compute test values of the appropriate size instead of hard-coding
40-character values. Rename the echo20 function to echoid, since the
values may be of varying sizes.
Signed-off-by: brian m. carlson
---
t/t0064-sha1-array.sh | 49 ---
1 file changed, 27
Compute the size of the tree and commit objects we're creating by
checking for the size of an object ID and computing the resulting sizes
accordingly.
Signed-off-by: brian m. carlson
---
t/t1006-cat-file.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t1006-cat-fil
Instead of hard-coding a 40-based constant, split the output of
for-each-ref and for-each-reflog by field.
Signed-off-by: brian m. carlson
---
t/t1405-main-ref-store.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
i
We transform various object IDs into all-zero object IDs for comparison.
Adjust the length as well so that this works for all hash algorithms.
While it would be slightly more efficient to use a sed y/// expression
instead of both the tr and sed, retain the tr in both cases for
parallelism and comp
non-zero.
>
> Thanks for going the extra mile and doing this!
>
> I wonder if we should also try to make the show_list() function part
> of the trace_*() functions to make it even more regular. This can be a
> separate patch or topic though.
Yeah that's probably a good idea
On Sun, Sep 2, 2018 at 9:42 AM, Nguyễn Thái Ngọc Duy wrote:
> In order to stop this from happening again, the function is now
> compiled unconditionally but exits early unless DEBUG_BISECT is
> non-zero.
Thanks for going the extra mile and doing this!
I wonder if we should also try to
This function only compiles when DEBUG_BISECT is 1, which is often not
the case. As a result there are two commits [1] [2] that break it but
the breakages went unnoticed because the code did not compile by
default. Update the function and include the new header file to make this
function build
On Fri, Aug 31, 2018 at 02:40:12PM -0400, Eric Sunshine wrote:
> On Fri, Aug 31, 2018 at 2:21 PM Torsten Bögershausen wrote:
> > Out of interest: why do we use a "tmp" file here?
> > Would it make more sense to chain the 'tr' with 'sed' and ski
On Fri, Aug 31 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> Fix up a logic error in 380efb65df ("push tests: assert re-pushing
>> annotated tags", 2018-07-31), where the $tag_type_description variable
>> was assigned to but never used, unlike in the subsequently added
>>
On Fri, Aug 31, 2018 at 4:07 PM Jeff King wrote:
> On Fri, Aug 31, 2018 at 02:33:18AM -0400, Eric Sunshine wrote:
> > diff --git a/Documentation/Makefile b/Documentation/Makefile
> > @@ -332,6 +332,7 @@ clean:
> > $(RM) manpage-base-url.xsl
> > + '$(SHELL_PATH_SQ)' ./doc-diff --clean
>
>
Ævar Arnfjörð Bjarmason writes:
> Fix up a logic error in 380efb65df ("push tests: assert re-pushing
> annotated tags", 2018-07-31), where the $tag_type_description variable
> was assigned to but never used, unlike in the subsequently added
> companion test for fetches in 2d216a7ef6 ("fetch test
Fix up a logic error in 380efb65df ("push tests: assert re-pushing
annotated tags", 2018-07-31), where the $tag_type_description variable
was assigned to but never used, unlike in the subsequently added
companion test for fetches in 2d216a7ef6 ("fetch tests: add a test for
clobbering tag behavior",
nd
> generated files are not strictly build products of the Makefile (which,
> itself, never runs doc-diff), as a convenience, update "make clean" to
> clean up doc-diff's working tree and generated files along with other
> development detritus normally removed by &q
; - tr '\015\000abcdef0123456789' QN0 <"$2" >"$exp" &&
> > + tr '\015\000abcdef0123456789' QN0 <"$2" >"$tmp" &&
> > tr '\015\000abcdef0123456789' QN00
<"$2" >"$tmp" &&
> tr '\015\000abcdef0123456789' QN0 <"$3" >"$act" &&
> + sed -e "s/*/$ZERO_OID/" "$tmp" >"$exp" &&
> test_cmp "$exp
tself, never runs doc-diff), as a convenience, update "make clean" to
clean up doc-diff's working tree and generated files along with other
development detritus normally removed by "make clean".
Signed-off-by: Eric Sunshine
---
Documentation/Makefile | 1 +
1 file changed
There is a change in behaviour with this commit. When there was
no initial commit, the shell version of stash would still display
a message. This commit makes `push` to not display any message if
`--quiet` or `-q` is specified.
Signed-off-by: Paul-Sebastian Ungureanu
---
builtin/stash--helper.c
On Thu, Aug 30 2018, Jeff King wrote:
> On Thu, Aug 30, 2018 at 01:29:53PM -0700, Junio C Hamano wrote:
>
>> >> > I do not know if the documentation that is shipped in 2.20 should
>> >> > talk about how the old world looked like, though. `-l` was a short
>> >> > for `--create-reflog` is worth s
On Thu, Aug 30, 2018 at 04:34:43PM -0400, Eric Sunshine wrote:
> On Thu, Aug 30, 2018 at 3:55 PM Jeff King wrote:
> > The tmp-doc-diff directory isn't strictly a build product of
> > the Makefile, since it's only present if you manually run
> > the doc-diff scr
On Thu, Aug 30, 2018 at 01:29:53PM -0700, Junio C Hamano wrote:
> >> > I do not know if the documentation that is shipped in 2.20 should
> >> > talk about how the old world looked like, though. `-l` was a short
> >> > for `--create-reflog` is worth saying, but I do not see much value
> >> > in ta
On Thu, Aug 30, 2018 at 4:34 PM Eric Sunshine wrote:
> Taking into consideration that people might be surprised and alarmed
> to find "git worktree list" showing a worktree they didn't explicitly
> create, would it make sense to do something like this?
>
> clean:
On Thu, Aug 30, 2018 at 3:55 PM Jeff King wrote:
> The tmp-doc-diff directory isn't strictly a build product of
> the Makefile, since it's only present if you manually run
> the doc-diff script. But anybody running "make clean" would
> probably want it to go away.
Jeff King writes:
> On Thu, Aug 30, 2018 at 09:53:25PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> > In the SYNOPSIS section we still see "[-l]" listed; that also must
>> > be replaced with "--create-reflog", or just dropped, as that is the
>> > default.
>>
>> Oh yes, it seems all of the doc inde
On Thu, Aug 30, 2018 at 09:53:25PM +0200, Ævar Arnfjörð Bjarmason wrote:
> > In the SYNOPSIS section we still see "[-l]" listed; that also must
> > be replaced with "--create-reflog", or just dropped, as that is the
> > default.
>
> Oh yes, it seems all of the doc indeed wasn't updated!
Sorry, t
The tmp-doc-diff directory isn't strictly a build product of
the Makefile, since it's only present if you manually run
the doc-diff script. But anybody running "make clean" would
probably want it to go away.
Suggested-by: Eric Sunshine
Signed-off-by: Jeff King
---
> An
On Thu, Aug 30 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>>> +-l::
>>> --list::
>>> List branches. With optional `...`, e.g. `git
>>> branch --list 'maint-*'`, list only the branches that match
>>
>> I think it's better to have something like this on top:
>>
>>
Ævar Arnfjörð Bjarmason writes:
>> +-l::
>> --list::
>> List branches. With optional `...`, e.g. `git
>> branch --list 'maint-*'`, list only the branches that match
>
> I think it's better to have something like this on top:
>
> diff --git a/Documentation/git-branch.txt b/Document
On Fri, Jun 22 2018, Jeff King wrote:
> diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
> index 1072ca0eb6..fc88e984e1 100644
> --- a/Documentation/git-branch.txt
> +++ b/Documentation/git-branch.txt
> @@ -100,8 +100,6 @@ OPTIONS
> The negated form `--no-create-ref
Since we're going to have multiple hash algorithms to test, it makes
sense to share as much of the test code as possible. Convert the sha1
helper for the test-tool to be generic and move it out into its own
module. This will allow us to share most of this code with our NewHash
implementation.
Si
Compute test values of the appropriate size instead of hard-coding
40-character values. Rename the echo20 function to echoid, since the
values may be of varying sizes.
Signed-off-by: brian m. carlson
---
t/t0064-sha1-array.sh | 49 ---
1 file changed, 27
Compute the size of the tree and commit objects we're creating by
checking for the size of an object ID and computing the resulting sizes
accordingly.
Signed-off-by: brian m. carlson
---
t/t1006-cat-file.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t1006-cat-fil
Instead of hard-coding a 40-based constant, split the output of
for-each-ref and for-each-reflog by field.
Signed-off-by: brian m. carlson
---
t/t1405-main-ref-store.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
i
Instead of hard-coding a 40-based constant, split the output of
for-each-ref and for-each-reflog by field.
Signed-off-by: brian m. carlson
---
t/t1407-worktree-ref-store.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-re
Instead of hard-coding a 40-based constant, split the output of
for-each-ref and for-each-reflog by field.
Signed-off-by: brian m. carlson
---
t/t1406-submodule-ref-store.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodu
We transform various object IDs into all-zero object IDs for comparison.
Adjust the length as well so that this works for all hash algorithms.
Signed-off-by: brian m. carlson
---
t/t0027-auto-crlf.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t0027-auto-crlf.sh b
On Tue, Aug 28, 2018 at 11:53:55PM +, Tacitus Aedifex wrote:
> While running `make test` on the git source tree I keep getting asked:
>
> Set preference list to:
>Cipher: ...
>Digest: ...
>etc...
>
> Is there any way to turn that prompt off so th
While running `make test` on the git source tree I keep getting asked:
Set preference list to:
Cipher: ...
Digest: ...
etc...
Is there any way to turn that prompt off so that `make test` completes without
any keyboard input?
//tæ
This makes rebase_path_todo(), get_missing_commit_check_level(),
write_message() and the enum check_level accessible outside sequencer.c,
renames check_level to missing_commit_check_level, and prefixes its
value names by MISSING_COMMIT_ to avoid namespace pollution.
This function and this enum wil
On Fri, Aug 24 2018, Antonio Ospite wrote:
> this series teaches git to try and read the .gitmodules file from the
> index (:.gitmodules) and the current branch (HEAD:.gitmodules) when it
> is not readily available in the working tree.
FWIW I didn't read any of the earlier series's, and I'm not
Hi,
this series teaches git to try and read the .gitmodules file from the
index (:.gitmodules) and the current branch (HEAD:.gitmodules) when it
is not readily available in the working tree.
This can be used, together with sparse checkouts, to enable submodule
usage with programs like vcsh[1] whi
While trying to run the build & test with NO_PERL, I noticed that t2024 had
a failing test case. This patch works around that failing test case by
skipping it when we know that the error message looks different than that
test case would expect.
Changes since v1 (which did not make it to the
fields.
Also agreed. I'd probably resolve it then by writing:
if (revs->read_from_stdin)
die("twice");
revs->read_from_stdin = 1;
I guess we could even do that now. Or add a test to make sure "--stdin
--stdin" barfs. But I am perfectly happy to punt until somebody actually
wants to use a bitfield.
-Peff
Jeff King writes:
> Yes. I was thinking it had more purpose than this, but it really is just
> a flag to check "did we do this already?". Which is one of the main
> purposes I claimed for the new flag in my commit message. :)
OK.
The reason I was on the fence was primarily because read_from_s
Junio C Hamano writes:
> I think this makes sense, but if we were to give a dedicated field
> in the revs structure, can we lose the local variable at the same
> time, I wonder?
>
> Thanks.
Well, the answer to "can we" is always "yes"; what I was truly
wondering was if it makes sense to do so.
t; >
> > This does mean a caller interested in the first role has to
> > check both flags, but there's only one such caller. And any
> > future callers might want to make the distinction anyway
> > (e.g., if they care less about erroring out, and more about
> > wh
t there's only one such caller. And any
> future callers might want to make the distinction anyway
> (e.g., if they care less about erroring out, and more about
> whether revision.c soaked up our stdin).
>
> [1]
> https://public-inbox.org/git/20170802223416.gwiezhbuxbdmb...
s a real patch. After giving it some
thought, I really do think it's cleaner.
I know we're in a freeze. If you want to pick this up for pu or maybe
next, that's fine. If not, I'll re-send it after the release. It applies
on top of Gábor's text fixup patch.
-- >8 --
Sub
Note that you can also trivially convert a lot more instances of empty
checking to the "right" way: 'test_line_count = 0'
$ grep -Ir 'test_line_count = 0' t | wc -l
76
I think it would be nice to clean these up as well.
6789' QN0 <"$2" >"$exp" &&
>>>> + tr '\015\000abcdef0123456789' QN0 <"$2" >"$exp+" &&
>>>
>>> My immediate thought upon reading this was whether "
xp" &&
> > > + tr '\015\000abcdef0123456789' QN0 <"$2" >"$exp+"
> > > &&
> >
> > My immediate thought upon reading this was whether "+" is valid in
> > Windows filenames
This series is a continuation of and applies on top of
'ab/test-must-be-empty-for-master', and converts even more places to
use 'test_must_be_empty'.
There are still a bunch of cases in the form of 'test -z "$(cmd...)"'
that could use 'test_must_be_empty'... maybe someday.
SZEDER Gábor (4):
te
&&
> > + tr '\015\000abcdef0123456789' QN0 <"$2" >"$exp+" &&
>
> My immediate thought upon reading this was whether "+" is valid in
> Windows filenames. Apparently, it is, but perhaps (if you re-ro
;"$exp+" &&
My immediate thought upon reading this was whether "+" is valid in
Windows filenames. Apparently, it is, but perhaps (if you re-roll) it
would make sense to use a character less likely to cause brain
hiccups; for instance, "exp0'.
> tr '\015\000abcdef0123456789' QN0 <"$3" >"$act" &&
> + sed -e "s/+/$ZERO_OID/" "$exp+" >"$exp" &&
Compute the size of the tree and commit objects we're creating by
checking for the size of an object ID and computing the resulting sizes
accordingly.
Signed-off-by: brian m. carlson
---
t/t1006-cat-file.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t1006-cat-fil
We transform various object IDs into all-zero object IDs for comparison.
Adjust the length as well so that this works for all hash algorithms.
Signed-off-by: brian m. carlson
---
t/t0027-auto-crlf.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t0027-auto-crlf.sh b/t/t
Instead of hard-coding a 40-based constant, split the output of
for-each-ref and for-each-reflog by field.
Signed-off-by: brian m. carlson
---
t/t1406-submodule-ref-store.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodu
Instead of hard-coding a 40-based constant, split the output of
for-each-ref and for-each-reflog by field.
Signed-off-by: brian m. carlson
---
t/t1405-main-ref-store.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
i
Compute test values of the appropriate size instead of hard-coding
40-character values. Rename the echo20 function to echoid, since the
values may be of varying sizes.
Signed-off-by: brian m. carlson
---
t/t0064-sha1-array.sh | 49 ---
1 file changed, 27
Instead of hard-coding a 40-based constant, split the output of
for-each-ref and for-each-reflog by field.
Signed-off-by: brian m. carlson
---
t/t1407-worktree-ref-store.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-re
> Subject: stash: make push to be quiet
Nit: maybe "stash: make push -q quiet"? I think the subject should at
least mention the -q option.
On 08/08, Paul-Sebastian Ungureanu wrote:
> There is a change in behaviour with this commit. When there was
> no initial commit, the she
This change itself only changes the internal communication and should
have no visible effect to the user. We instruct the diff code that
produces the inner diffs to use other markers instead of the
usual markers for new, old and context lines.
Signed-off-by: Stefan Beller
---
range-diff.c | 20 +
Elijah Newren wrote:
> Since both functions are using the same data type, they should either both
> refer to it as void *, or both use the real type (struct alloc_state *).
> Opt for the latter.
>
> Reviewed-by: Jonathan Nieder
> Signed-off-by: Elijah Newren
Not worth rerolling for this, but th
Since both functions are using the same data type, they should either both
refer to it as void *, or both use the real type (struct alloc_state *).
Opt for the latter.
Reviewed-by: Jonathan Nieder
Signed-off-by: Elijah Newren
---
alloc.c | 2 +-
alloc.h | 2 +-
2 files changed, 2 insertions(+),
Historically, nobody paid attention to our own source code having correct
Git attributes
[https://www.edwardthomson.com/blog/git_for_windows_line_endings.html] when
it comes to line endings. Because historically, we had no good way to
specify that ;-)
But now we do, and so we need to use it. Espec
Elijah Newren wrote:
> Since both functions are using the same data type, they should either both
> refer to it as void *, or both use the real type (struct alloc_state *).
> Opt for the latter.
>
> Signed-off-by: Elijah Newren
> ---
> alloc.c | 2 +-
> alloc.h | 2 +-
> 2 files changed, 2 inse
ctly needed for now and there is no immediate
benefit from them.
* Added a check to git-submodule.sh::cdm_add to make it fail earlier
if the .gitmodules file is not "safely writeable". This also fixes
one of the new tests which was previously marked as
"test_expect
Hello,
I have updated to the latest master and trying to build git plus its
Info manuals.
I am on RHEL 6.8. It does not have docbook2x-texi, but I was able to
install docbook2texi from https://sourceforge.net/p/docbook2x.
The whole git build goes fine except when it reaches the "make info&
> > strbuf_addbuf(&buf, &line);
> > + }
>
> My preliminary reading (I sadly lack the time to pull your branch and play
> with it) suggests that this works, although I have to admit that X/Y/Z
> would confuse me in 6 months from now, as they do not really read like
Since both functions are using the same data type, they should either both
refer to it as void *, or both use the real type (struct alloc_state *).
Opt for the latter.
Signed-off-by: Elijah Newren
---
alloc.c | 2 +-
alloc.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/
We're moving away from the_index in this code. "struct index_state *"
could be added to struct apply_state. But let's aim long term and put
struct repository here instead so that we could even avoid more global
states in the future. The index will be available via
apply_state->repo->index.
Signed-
Hi Stefan,
On Fri, 10 Aug 2018, Stefan Beller wrote:
> This change itself only changes the internal communication and should
> have no visible effect to the user. We instruct the diff code that produces
> the inner diffs to use X, Y, Z instead of the usual markers for new, old
> and context lines
.
Therefore, we really want to make the dual color mode the default.
Signed-off-by: Johannes Schindelin
---
Documentation/git-range-diff.txt | 32 +++---
builtin/range-diff.c | 10
contrib/completion/git-completion.bash | 2 +-
3 files changed
> That will recurse any subdirectories, possibly wasting time, but since
> the point is that we expect it to be empty, that's probably OK.
One caveat involves invocations of `test_must_fail test_dir_is_empty`,
wherein we _don't_ actually expect the directory to be empty. It looks
like there might
Since both functions are using the same data type, they should either both
refer to it as void *, or both use the real type (struct alloc_state *).
Opt for the latter.
Signed-off-by: Elijah Newren
---
alloc.c | 2 +-
alloc.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/
Since both functions are using the same data type, they should either both
refer to it as void *, or both use the real type (struct alloc_state *).
Opt for the latter.
Signed-off-by: Elijah Newren
---
alloc.c | 2 +-
alloc.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/
This change itself only changes the internal communication and should
have no visible effect to the user. We instruct the diff code that produces
the inner diffs to use X, Y, Z instead of the usual markers for new, old
and context lines
Signed-off-by: Stefan Beller
---
range-diff.c | 15
.
Therefore, we really want to make the dual color mode the default.
Signed-off-by: Johannes Schindelin
---
Documentation/git-range-diff.txt | 32 +++---
builtin/range-diff.c | 10
contrib/completion/git-completion.bash | 2 +-
3 files changed
f the dual color mode still
> > leaves a lot of room for confusion about what was actually changed, the
> > non-dual color mode is substantially worse in that regard.
> >
> > Therefore, we really want to make the dual color mode the default.
>
> Ah and here we're
This makes rebase_path_todo(), get_missing_commit_check_level(),
write_message() and the enum check_level accessible outside sequencer.c,
renames check_level to missing_commit_check_level, and prefixes its
value names by MISSING_COMMIT_ to avoid namespace pollution.
This function and this enum wil
rticularly think it is "dangerous". In fact, that sort
> of behaviour was what I had in mind when I said "work sensibly".
>
> When resolving a conflict that they added a new path at stage #3 to
> remove that path, I can say "git rm $that_path", which removes all
&
t;.
When resolving a conflict that they added a new path at stage #3 to
remove that path, I can say "git rm $that_path", which removes all
stages of that path and make the index closer to the next commit.
Or I may decide to keep that path by "git add $that_path", which
adds that pa
t; > will clean up files created by the merge operation.
>
> Yeah, and then our file "path" renamed to "path~2" to make room for
> directory "path" they introduced, can be relocated to its final
> place in the merge resolution, e.g. "git mv path~2 p
the way; if we also record
> the file under a different name in the index then it simplifies matters
> for the user, and ensures that 'git reset --hard' and 'git merge --abort'
> will clean up files created by the merge operation.
Yeah, and then our file "path&q
From: Jeff King
As get_delta_base() will be used outside 'packfile.c' in
a following commit, let's make it non static and let's
declare it in 'packfile.h'.
Signed-off-by: Jeff King
Signed-off-by: Christian Couder
---
packfile.c | 10 +-
packfile.h |
Hi Phillip,
On Thu, 9 Aug 2018, Phillip Wood wrote:
> On 09/08/18 10:22, Johannes Schindelin wrote:
> >
> > On Mon, 6 Aug 2018, Phillip Wood wrote:
> >
> >> On 06/08/18 10:52, Johannes Schindelin via GitGitGadget wrote:
> >>>
> >>> + else if (is_fixup(command)) {
> >>> +
On 09/08/18 10:22, Johannes Schindelin wrote:
> Hi Phillip,
>
> On Mon, 6 Aug 2018, Phillip Wood wrote:
>
>> On 06/08/18 10:52, Johannes Schindelin via GitGitGadget wrote:
>>>
>>> From: Johannes Schindelin
>>>
>>> The idea of `--exec` is to append an `exec` call after each `pick`.
>>>
>>> Since
From: Johannes Schindelin
The idea of `--exec` is to append an `exec` call after each `pick`.
Since the introduction of fixup!/squash! commits, this idea was extended
to apply to "pick, possibly followed by a fixup/squash chain", i.e. an
exec would not be inserted between a `pick` and any of its
the end of the fixup/squash chain, we
continue the loop, delaying the insertion until we know where the
fixup/squash chain ends, if any.
Johannes Schindelin (2):
t3430: demonstrate what -r, --autosquash & --exec should do
rebase --exec: make it work with --rebase-merges
seque
Hi Phillip,
On Mon, 6 Aug 2018, Phillip Wood wrote:
> On 06/08/18 10:52, Johannes Schindelin via GitGitGadget wrote:
> >
> > From: Johannes Schindelin
> >
> > The idea of `--exec` is to append an `exec` call after each `pick`.
> >
> > Since the introduction of fixup!/squash! commits, this ide
Currently when git-fetch is asked to recurse into submodules, it dispatches
a plain "git-fetch -C " (and some submodule related options
such as prefix and recusing strategy, but) without any information of the
remote or the tip that should be fetched.
This works surprisingly well in some workflows
There is a change in behaviour with this commit. When there was
no initial commit, the shell version of stash would still display
a message. This commit makes `push` to not display any message if
`--quiet` or `-q` is specified.
---
builtin/stash--helper.c | 41 +++--
On Tue, Aug 7, 2018 at 2:07 AM, SZEDER Gábor wrote:
>> A test making use of test_must_fail was failing like this:
>> fatal: ambiguous argument '|': unknown revision or path not in the working
>> tree.
>> when the intent was to verify that a specific string was not found
>> in the output of the
801 - 900 of 5380 matches
Mail list logo
