On Mon, Sep 24, 2018 at 11:32:23PM +0200, SZEDER Gábor wrote:
> On Mon, Sep 24, 2018 at 02:15:30PM -0700, Derrick Stolee via GitGitGadget
> wrote:
> > From: Derrick Stolee
> >
> > The index v4 format has been available since 2012 with 9d22778
> > "reach-cache.c: write prefix-compressed names in
The commits are lost always if both users did `git push --force`
How to reproduce:
1. First user: `git push --force`
2. Second user: `git push --force`
3. First user: `git pull -v --rebase`
Here after 3 I expect that git will say that after rebase some commits from
current branch will not be exi
On Fri, Aug 3, 2018 at 12:55 AM, Stefan Beller wrote:
> On Wed, Aug 1, 2018 at 11:16 PM Christian Couder
> wrote:
>>
>> From: Christian Couder
>>
>> Signed-off-by: Junio C Hamano
>> ---
>> Documentation/config.txt | 5 +
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/Documentation/c
This path series is a follow up from the patch series called "odb
remote" that I sent earlier this year, which was itself a follow up
from previous series. See the links section for more information.
Goal
This series is about introducing a remote ODB mechanism and showing
that this mechanism
From: Christian Couder
The callers of the fetch_object() and fetch_objects() might
be interested in knowing if these functions succeeded or not.
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
fetch-object.c | 13 -
fetch-object.h | 4 ++--
sha1-file.c| 4 +
From: Christian Couder
We will need to reinitialize the remote odb configuration
as we will make some changes to it in a later commit when
we will detect that a remote is also a remote odb.
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
remote-odb.c | 14 --
rem
From: Christian Couder
This is implemented only in the promisor remote mode
for now by calling fetch_objects().
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
odb-helper.c | 15 +++
odb-helper.h | 3 +++
remote-odb.c | 17 +
remote-odb.h | 1 +
From: Christian Couder
The remote-odb.{c,h} files will contain the functions
that are called by the rest of Git mostly from
"sha1-file.c" to access the objects managed by the
remote odbs.
The odb-helper.{c,h} files will contain the functions to
actually implement communication with either the in
From: Christian Couder
Signed-off-by: Junio C Hamano
---
Documentation/config.txt | 5 +
1 file changed, 5 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ad0f4510c3..9df988adb9 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -26
Instead of using the repository_format_partial_clone global
and fetch_objects() directly, let's use has_remote_odb() and
remote_odb_get_direct().
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
builtin/cat-file.c| 5 +++--
builtin/fetch.c | 11 ++
From: Christian Couder
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
t/t0410-partial-clone.sh | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index 8b32be6417..3fbd8d919e 100755
From: Christian Couder
Let's make the partial clone filter specific to one odb
instead of general to all the odbs.
This makes it possible to have different partial clone
filters for different odbs.
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
builtin/fetch.c
From: Derrick Stolee
Due to a regression introduced by 4fbcca4e "commit-reach: make
can_all_from_reach... linear" the series including b67f6b26
"commit-reach: properly peel tags" was merged to master quickly.
There were a few more cleanups left to apply in the series, which
are included by this
On 9/25/2018 3:06 AM, Patrick Steinhardt wrote:
On Mon, Sep 24, 2018 at 11:32:23PM +0200, SZEDER Gábor wrote:
On Mon, Sep 24, 2018 at 02:15:30PM -0700, Derrick Stolee via GitGitGadget wrote:
From: Derrick Stolee
The index v4 format has been available since 2012 with 9d22778
"reach-cache.c: wr
We've got a fairly large codebase that's been through two previous source
control systems, and recently converted to git. We have shared modules (but
with customization) between projects, so subtrees looked like a good approach
to sharing the code between projects. I've encountered a problem pus
On Tue, Sep 25, 2018 at 1:54 PM Christian Couder
wrote:
>
> From: Christian Couder
>
> Signed-off-by: Junio C Hamano
> ---
> Documentation/config.txt | 5 +
> 1 file changed, 5 insertions(+)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index ad0f4510c3..9df988adb9
On Mon, Sep 24, 2018 at 10:58 PM Junio C Hamano wrote:
> I personally find "help -av" a bit too loud to my taste than plain
> "-a", and more importantly, I look at "help -a" primarily to check
> the last section "avaialble from elsewhere on your $PATH" to find
> things like "clang-format", which I
On Tue, Sep 25, 2018 at 4:35 AM Stefan Beller wrote:
>
> On Sat, Sep 22, 2018 at 11:05 AM Nguyễn Thái Ngọc Duy
> wrote:
> >
> > When multiple worktrees are used, we need rules to determine if
> > something belongs to one worktree or all of them. Instead of keeping
> > adding rules when new stuff
On 9/24/18 4:24 PM, Junio C Hamano wrote:
Sebastian Kuzminsky writes:
I've got two tiny git repos whose commit graphs are identical, but
where 'git describe' gives different results. ... The histories
differ only in the timestamps of the commits...
describe does take the commit timestamps i
On Tue, Sep 25, 2018 at 4:48 AM Stefan Beller wrote:
> > This patch also makes it possible to specify refs from one worktree in
> > another one, e.g.
> >
> > git log worktrees/foo/HEAD
>
> This has strong similarities to remote refs:
> Locally I may have a branch master, whose (stale local cop
On Mon, Sep 24, 2018 at 4:21 PM Taylor Blau wrote:
> > +cmp_config() {
> > + if [ "$1" = "-C" ]; then
> > + shift &&
> > + GD="-C $1" &&
> > + shift
> > + else
> > + GD=
> > + fi &&
> > + echo "$1" >expected &&
> > + shift &&
> >
On Tue, Sep 25, 2018 at 5:41 PM Sebastian Kuzminsky wrote:
> That behavior seems to me to be different from what the (2.11) manpage says:
Good opportunity to improve the man page anyway even if Junio is
right. I agree that the section about "search strategy" is a bit
misleading because it does no
On Tue, Sep 25, 2018 at 6:05 PM Duy Nguyen wrote:
>
> On Tue, Sep 25, 2018 at 5:41 PM Sebastian Kuzminsky wrote:
> > That behavior seems to me to be different from what the (2.11) manpage says:
>
> Good opportunity to improve the man page anyway even if Junio is
> right. I agree that the section
On Tue, Sep 25, 2018 at 8:36 AM Duy Nguyen wrote:
>
> On Tue, Sep 25, 2018 at 4:35 AM Stefan Beller wrote:
> >
> > On Sat, Sep 22, 2018 at 11:05 AM Nguyễn Thái Ngọc Duy
> > wrote:
> > >
> > > When multiple worktrees are used, we need rules to determine if
> > > something belongs to one worktree
On Tue, Sep 25, 2018 at 8:49 AM Duy Nguyen wrote:
>
> On Tue, Sep 25, 2018 at 4:48 AM Stefan Beller wrote:
> > > This patch also makes it possible to specify refs from one worktree in
> > > another one, e.g.
> > >
> > > git log worktrees/foo/HEAD
> >
> > This has strong similarities to remote
On Tue, Sep 25, 2018 at 6:24 PM Stefan Beller wrote:
> > > That sounds dangerous to me. There is already a concept of
> > > local and remote-tracking branches. So I would think that local
> > > may soon become an overused word, (just like "index" today or
> > > "recursive" to a lesser extend).
> >
Jeff King writes:
> Right, I think that is totally fine for the current uses. I guess my
> question was: do you envision cutting the interface down to only the
> oids to bite us in the future?
>
> I was on the fence during past discussions, but I think I've come over
> to the idea that the refnam
On Tue, Sep 25, 2018 at 05:15:38PM +0200, Duy Nguyen wrote:
> On Mon, Sep 24, 2018 at 10:58 PM Junio C Hamano wrote:
> > I personally find "help -av" a bit too loud to my taste than plain
> > "-a", and more importantly, I look at "help -a" primarily to check
> > the last section "avaialble from el
On Tue, Sep 25, 2018 at 9:55 AM Duy Nguyen wrote:
> > And with that said, I wonder if the "local" part should be feature agnostic,
> > or if we want to be "local" for worktrees, "local" for remotes, "local"
> > for submodules (i.e. our own refs vs submodule refs).
>
> You lost me here.
Yeah, me
On Tue, Sep 25, 2018 at 7:30 AM Derrick Stolee wrote:
>
> On 9/25/2018 3:06 AM, Patrick Steinhardt wrote:
> > On Mon, Sep 24, 2018 at 11:32:23PM +0200, SZEDER Gábor wrote:
> >> On Mon, Sep 24, 2018 at 02:15:30PM -0700, Derrick Stolee via GitGitGadget
> >> wrote:
> >>> From: Derrick Stolee
> >>>
Derrick Stolee writes:
> @@ -622,10 +623,7 @@ int can_all_from_reach_with_flag(struct object_array
> *from,
> }
>
> cleanup:
> - for (i = 0; i < nr_commits; i++) {
> - clear_commit_marks(list[i], RESULT);
> - clear_commit_marks(list[i], assign_flag);
> -
On 9/25/2018 2:06 PM, Junio C Hamano wrote:
Derrick Stolee writes:
@@ -622,10 +623,7 @@ int can_all_from_reach_with_flag(struct object_array *from,
}
cleanup:
- for (i = 0; i < nr_commits; i++) {
- clear_commit_marks(list[i], RESULT);
- clear_com
"Derrick Stolee via GitGitGadget" writes:
> +files=$(git diff --name-only $V1 $V2 -- *.c)
You'd want to quote that *.c from the shell, i.e. either one of
these
files=$(git diff --name-only $V1 $V2 -- \*.c)
files=$(git diff --name-only $V1 $V2 -- '*.c')
otherwise you'd lose thin
In an effort to ensure new code is reasonably covered by the test suite,
we now have contrib/coverage-diff.sh to combine the gcov output from
'make coverage-test ; make coverage-report' with the output from 'git
diff A B' to discover _new_ lines of code that are not covered.
This report takes
On 9/20/2018 2:43 PM, Junio C Hamano wrote:
Ben Peart writes:
This round has one code change based on feedback. Other changes are just
rewording commit messages.
Thanks. I think the only remaining issue is what to do with the
interaction between extra/additional error message that comes
On Mon, 2018-09-24 at 17:17 +0200, Duy Nguyen wrote:
> On Sun, Sep 23, 2018 at 10:19 PM Kaartic Sivaraam
> wrote:
>
> Yes, some bugs. It behaves correctly for me. There must be something
> strange that triggers this. What's your "git worktree list" (iow
> anything strange there, duplicate worktre
On Sat, Sep 22, 2018 at 5:58 AM Ævar Arnfjörð Bjarmason
wrote:
>
>
> On Fri, Sep 21 2018, Stefan Beller wrote:
>
> > +/*
> > + * Apply want to each entry in array, retaining only the entries for
> > + * which the function returns true. Preserve the order of the entries
> > + * that are retained.
Gerrit, the code review tool, has a different workflow than our mailing
list based approach. Usually users upload changes to a Gerrit server and
continuous integration and testing happens by bots. Sometimes however a
user wants to checkout a change locally and look at it locally. For this
use case,
This patch started as a refactoring to make 'get_next_submodule' more
readable, but upon doing so, I realized that "git fetch" of the submodule
actually doesn't need to be run in the submodules worktree. So let's run
it in its git dir instead.
That should pave the way towards fetching submodules t
Currently when git-fetch is asked to recurse into submodules, it dispatches
a plain "git-fetch -C " (with 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 workflow
When constructing a struct repository for a submodule for some revision
of the superproject where the submodule is not contained in the index,
it may not be present in the working tree currently either. In that
siutation giving a 'path' argument is not useful. Upgrade the
repo_submodule_init functi
The submodule subsystem is really bad at staying within 80 characters.
Fix it while we are here.
Signed-off-by: Stefan Beller
---
submodule.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/submodule.c b/submodule.c
index b53cb6e9c47..0de9e2800ad 100644
--- a/submodu
'calculate_changed_submodule_paths' uses a local list to compute the
changed submodules, and then produces the result by copying appropriate
items into the result list.
Instead use the result list directly and prune items afterwards
using string_list_remove_empty_items.
By doing so we'll have acc
The `changed_submodule_names` are only used for fetching, so let's make it
part of the struct that is passed around for fetching submodules.
Signed-off-by: Stefan Beller
---
submodule.c | 42 +++---
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git
v4:
* Per Ævars comment, moved the docs for oid_array_filter into
Documentation/technical/...
* addressed all outstanding comment as noted in "What's cooking" email,
* below is a range-diff against the currently queued version of the
series.
v3:
* I discovered some issues with v2 after sending
We can string_list_insert() to maintain sorted-ness of the
list as we find new items, or we can string_list_append() to
build an unsorted list and sort it at the end just once.
To pick which one is more appropriate, we notice the fact
that we discover new items more or less in the already
sorted o
Helped-by: Junio C Hamano
Signed-off-by: Stefan Beller
---
Documentation/technical/api-oid-array.txt | 5 +
sha1-array.c | 17 +
sha1-array.h | 3 +++
3 files changed, 25 insertions(+)
diff --git a/Documentation/tec
On Mon, Sep 24, 2018 at 09:05:56PM -0700, John Austin wrote:
> On Mon, Sep 24, 2018 at 12:58 PM Taylor Blau wrote:
> > I'm replying to this part of the email to note that this would cause Git
> > LFS to have to do some extra work, since running 'git lfs install'
> > already writes to .git/hooks/po
Derrick Stolee writes:
> Another commit walk that could be improved by generation numbers? It's
> like my bat-signal!
Ah, nevermind. The "traversal" done by these helper functions is
the most stupid kind (not the algorthim, but the need). It's not
like there is an opportunity to optimize by no
Hello Dear,
I am working in financial firm in Asia. I have a business to transfer i have
abandon $19.000.000.00 in my office.
If you are interested in the transaction, please reply for full information.
Best Regards,
Financial Asia
Stefan Beller writes:
> Heh, thanks for calling that out. So we're looking at a full formatter
> instead of a partial formatter that helps moving in the right direction now.
> :-/
The parts left out of these patches (e.g. use subshell when working
in a subdirectory) need human decision and a bi
On Tue, Sep 25, 2018 at 07:44:51PM +0200, Duy Nguyen wrote:
> > I think adding another section about external commands in "help -av"
> > would address the "clang-format" stuff. With that, it's probably good
> > enough to completely replace "help -a". It may also be good to list
> > aliases there t
SZEDER Gábor writes:
> However, if we go for a more informative error message, then wouldn't
> it be better to add this condition in populate_value() before it even
> calls get_object()? Then we could also add the problematic format
> specifier to the error message (I think, but didn't actually
On 9/25/2018 2:42 PM, Derrick Stolee wrote:
In an effort to ensure new code is reasonably covered by the test suite,
we now have contrib/coverage-diff.sh to combine the gcov output from
'make coverage-test ; make coverage-report' with the output from 'git
diff A B' to discover _new_ lines of
Nguyễn Thái Ngọc Duy writes:
> The main worktree has to be treated specially because well.. it's
> special from the beginning. So HEAD from the main worktree is
> acccessible via the name "main/HEAD" (we can't use
> "worktrees/main/HEAD" because "main" under "worktrees" is not
> reserved).
I do
On 9/25/2018 2:01 PM, Stefan Beller wrote:
On Tue, Sep 25, 2018 at 7:30 AM Derrick Stolee wrote:
On 9/25/2018 3:06 AM, Patrick Steinhardt wrote:
On Mon, Sep 24, 2018 at 11:32:23PM +0200, SZEDER Gábor wrote:
On Mon, Sep 24, 2018 at 02:15:30PM -0700, Derrick Stolee via GitGitGadget wrote:
Nguyễn Thái Ngọc Duy writes:
> This extension is most useful in multiple worktree setup because you
> now have an option to store per-worktree config (which is either
> .git/config.worktree for main worktree, or
> .git/worktrees/xx/config.worktree for linked ones).
Heh. "This is useful if you
Kaartic Sivaraam writes:
>> Also please try
>> "git fetch" again with GIT_TRACE=1 and GIT_TRACE_SETUP=1. Hopefully we
>> could catch something with that.
>
> $ GIT_TRACE_SETUP=1 GIT_TRACE=1 git fetch origin next
> 23:10:26.049785 trace.c:377 setup: git_dir:
> $COMMON_ROOT/git/.git/w
Hello
i have been trying to contact you i have a transaction for you.
I mentioned about a month ago in [1] that we needed to add members to
the committee representing the Git project as part of Software Freedom
Conservancy (see that email for details on what exactly that means :) ).
I'm happy to announce that this is now done, and both Christian and Ævar
are on the
Hello
i have been trying to contact you i have a transaction for you.
On Mon, Sep 24, 2018 at 2:03 PM SZEDER Gábor wrote:
> > + - In a piped chain such as "grep blob objects | sort", the exit codes
>
> Let's make an example with git in it, e.g. something like this:
>
> git cmd | grep important | sort
>
> since just two lines below the new text mentions git crashin
Hello
i have been trying to contact you i have a transaction for you.
Philip Oakley writes:
> +Variable name/value syntax
> +^^
> +
> All the other lines (and the remainder of the line after the section
> header) are recognized as setting variables, in the form
> 'name = value' (or just 'name', which is a short-hand to say that
> @@ -69,7
Jonathan Tan writes:
> Whenever a lazy fetch is performed for a tree object, any trees and
> blobs it directly or indirectly references will be fetched as well.
> There is a "no_dependents" argument in struct fetch_pack_args that
> indicates that objects that the wanted object references need not
Hi,
Sorry for the late reply. I had a lot on my plate for the last couple of
weeks.
+
+ git_config(git_diff_basic_config, NULL);
Is this not called in as part of `git_config(git_default_config, NULL);`
in cmd_stash() already?
*clicketyclick*
I guess not. But then, maybe it would mak
Hi,
@@ -1443,9 +1448,10 @@ static int push_stash(int argc, const char **argv, const char *prefix)
OPT_END()
};
- argc = parse_options(argc, argv, prefix, options,
-git_stash_helper_push_usage,
-0);
+ if
Christian Couder writes:
> The main issue that this patch series tries to solve is that
> extensions.partialclone config option limits the partial clone and
> promisor features to only one remote. One related issue is that it
> also prevents to have other kind of promisor/partial clone/odb
> remo
Rename some test cases' labels to be more descriptive and under 80
characters per line.
Signed-off-by: Paul-Sebastian Ungureanu
---
t/t3903-stash.sh | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index de6cab1fe7..3114c7bc4c
Rename some test cases' labels to be more descriptive and under 80
characters per line.
Signed-off-by: Paul-Sebastian Ungureanu
---
t/t3903-stash.sh | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index de6cab1fe7..3114c7bc4c
From: Joel Teichroeb
In preparation for converting the stash command incrementally to
a builtin command, this patch improves test coverage of the option
parsing. Both for having too many parameters, or too few.
Signed-off-by: Joel Teichroeb
Signed-off-by: Paul-Sebastian Ungureanu
---
t/t3903-
Removed whitespaces after redirection operators.
Signed-off-by: Paul-Sebastian Ungureanu
---
t/t3903-stash.sh | 120 ---
1 file changed, 61 insertions(+), 59 deletions(-)
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index af7586d43d..de6cab1fe7 10
From: Joel Teichroeb
In preparation for converting the stash command incrementally to
a builtin command, this patch improves test coverage of the option
parsing. Both for having too many parameters, or too few.
Signed-off-by: Joel Teichroeb
Signed-off-by: Paul-Sebastian Ungureanu
---
t/t3903-
Add stash list to the helper and delete the list_stash function
from the shell script.
Signed-off-by: Paul-Sebastian Ungureanu
---
builtin/stash--helper.c | 31 +++
git-stash.sh| 7 +--
2 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/b
Add stash push to the helper.
Signed-off-by: Paul-Sebastian Ungureanu
---
builtin/stash--helper.c | 244 +++-
git-stash.sh| 6 +-
2 files changed, 244 insertions(+), 6 deletions(-)
diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
i
Hello,
This is a new iteration of `git stash`, based on the last review I got.
This new iteration brings mostly code styling fix issues in order to make
the code more readable. There is also a new patch "strbuf.c: add
`strbuf_join_argv()`". By making some small changes, the code is now a
little bi
This commit introduces tests for `git stash show`
config. It tests all the cases where `stash.showStat`
and `stash.showPatch` are unset or set to true / false.
Signed-off-by: Paul-Sebastian Ungureanu
---
t/t3907-stash-show-config.sh | 83
1 file changed, 83 i
Mention in the usage text and in the documentation, that `show`
accepts any option known to `git diff`.
Signed-off-by: Paul-Sebastian Ungureanu
---
Documentation/git-stash.txt | 4 ++--
builtin/stash--helper.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documenta
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
From: Joel Teichroeb
Add stash branch to the helper and delete the apply_to_branch
function from the shell script.
Checkout does not currently provide a function for checking out
a branch as cmd_checkout does a large amount of sanity checks
first that we require here.
Signed-off-by: Joel Teichr
Removed whitespaces after redirection operators.
Signed-off-by: Paul-Sebastian Ungureanu
---
t/t3903-stash.sh | 120 ---
1 file changed, 61 insertions(+), 59 deletions(-)
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index af7586d43d..de6cab1fe7 10
Add stash show to the helper and delete the show_stash, have_stash,
assert_stash_like, is_stash_like and parse_flags_and_rev functions
from the shell script now that they are no longer needed.
In shell version, although `git stash show` accepts `--index` and
`--quiet` options, it ignores them. In
Implement `strbuf_join_argv()` to join arguments
into a strbuf.
Signed-off-by: Paul-Sebastian Ungureanu
---
strbuf.c | 15 +++
strbuf.h | 7 +++
2 files changed, 22 insertions(+)
diff --git a/strbuf.c b/strbuf.c
index 64041c3c24..3eb431b2b0 100644
--- a/strbuf.c
+++ b/strbuf.c
Compared to `get_oid()`, `get_oidf()` has as parameters
a pointer to `object_id`, a printf format string and
additional arguments. This will help simplify the code
in subsequent commits.
Original-idea-by: Johannes Schindelin
Signed-off-by: Paul-Sebastian Ungureanu
---
cache.h | 1 +
sha1-n
This commit replaces spawning `git write-tree` with API calls.
Signed-off-by: Paul-Sebastian Ungureanu
---
builtin/stash.c | 41 -
1 file changed, 12 insertions(+), 29 deletions(-)
diff --git a/builtin/stash.c b/builtin/stash.c
index 43d0de1f13..86a7e0a5a
This commits introduces a optimization by avoiding calling the
same functions again. For example, `git stash push -u`
would call at some points the following functions:
* `check_changes()` (inside `do_push_stash()`)
* `do_create_stash()`, which calls: `check_changes()` and
`get_untracked_files()
From: Joel Teichroeb
Add stash pop to the helper and delete the pop_stash, drop_stash,
assert_stash_ref functions from the shell script now that they
are no longer needed.
Signed-off-by: Joel Teichroeb
Signed-off-by: Paul-Sebastian Ungureanu
---
builtin/stash--helper.c | 38 ++
From: Joel Teichroeb
Add a builtin helper for performing stash commands. Converting
all at once proved hard to review, so starting with just apply
lets conversion get started without the other commands being
finished.
The helper is being implemented as a drop in replacement for
stash so that whe
Implement `strbuf_join_argv()` to join arguments.
Signed-off-by: Paul-Sebastian Ungureanu
---
strbuf.c | 15 +++
strbuf.h | 7 +++
2 files changed, 22 insertions(+)
diff --git a/strbuf.c b/strbuf.c
index 64041c3c24..3eb431b2b0 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -259,6 +259
The old shell script `git-stash.sh` was removed and replaced
entirely by `builtin/stash.c`. In order to do that, `create` and
`push` were adapted to work without `stash.sh`. For example, before
this commit, `git stash create` called `git stash--helper create
--message "$*"`. If it called `git stas
Add stash store to the helper and delete the store_stash function
from the shell script.
Signed-off-by: Paul-Sebastian Ungureanu
---
builtin/stash--helper.c | 60 +
git-stash.sh| 43 ++---
2 files changed, 62 insertions(
Add stash create to the helper.
Signed-off-by: Paul-Sebastian Ungureanu
---
builtin/stash--helper.c | 450
git-stash.sh| 2 +-
2 files changed, 451 insertions(+), 1 deletion(-)
diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
Add stash save to the helper and delete functions which are no
longer needed (`show_help()`, `save_stash()`, `push_stash()`,
`create_stash()`, `clear_stash()`, `untracked_files()` and
`no_changes()`).
The `-m` option is no longer supported as it might not make
sense to have two ways of passing a m
From: Joel Teichroeb
Add the drop and clear commands to the builtin helper. These two
are each simple, but are being added together as they are quite
related.
We have to unfortunately keep the drop and clear functions in the
shell script as functions are called with parameters internally
that ar
This commit introduces tests for `git stash show`
config. It tests all the cases where `stash.showStat`
and `stash.showPatch` are unset or set to true / false.
Signed-off-by: Paul-Sebastian Ungureanu
---
t/t3907-stash-show-config.sh | 83
1 file changed, 83 i
On Tue, Sep 25, 2018 at 10:41:18AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Right, I think that is totally fine for the current uses. I guess my
> > question was: do you envision cutting the interface down to only the
> > oids to bite us in the future?
> >
> > I was on the fence duri
The built-in bundle transport and the transport helper interface do not
work when transport_fetch_refs() is called immediately after transport
creation.
Evidence: fetch_refs_from_bundle() relies on data->header being
initialized in get_refs_from_bundle(), and fetch() in transport-helper.c
relies o
Jonathan Tan writes:
> diff --git a/transport-helper.c b/transport-helper.c
> index 143ca008c8..7213fa0d32 100644
> --- a/transport-helper.c
> +++ b/transport-helper.c
> @@ -1105,6 +1105,7 @@ static struct ref *get_refs_list(struct transport
> *transport, int for_push,
> }
>
> static struct
Taylor Blau writes:
> My reading of this is threefold:
>
> 1. There are some cosmetic changes that need to occur in t5410 and
> documentation, which are mentioned above. Those seem self
> explanatory, and I've applied the necessary bits already on my
> local version of this topic
--
Did you receive our proposal email ?
1 - 100 of 114 matches
Mail list logo
