On 12/10, Duy Nguyen wrote:
> On Sun, Dec 9, 2018 at 9:05 PM Thomas Gummerer wrote:
> >
> > Currently when 'git checkout -- ...' is invoked with
> > multiple pathspecs, where one or more of the pathspecs don't match
> > anything, checkout errors out.
>
On 12/10, Elijah Newren wrote:
> On Sun, Dec 9, 2018 at 12:05 PM Thomas Gummerer wrote:
> >
> > Add a new --cached option to git checkout, which works only on the
> > index, but not the working tree, similar to what 'git reset
> > -- ... does. Indeed the
On 12/11, Junio C Hamano wrote:
> Elijah Newren writes:
>
> >> Note that 'git checkout -p -- []' already works
> >> this way, so no changes are needed for the patch mode. We disallow
> >> 'git checkout --overlay -p' to avoid confusing users who would expect
> >> to be able to force overlay mode
On 12/10, Elijah Newren wrote:
> On Sun, Dec 9, 2018 at 12:05 PM Thomas Gummerer wrote:
> >
> > 'checkout_entry()' currently only supports creating new entries in the
> > working tree, but not deleting them. Add the ability to remove
> > entries at the same
On 12/10, Elijah Newren wrote:
> On Mon, Dec 10, 2018 at 8:09 AM Duy Nguyen wrote:
> >
> > On Sun, Dec 9, 2018 at 9:05 PM Thomas Gummerer wrote:
> > >
> > > When marking cache entries for removal, and later removing them all at
> > > once using
On 12/10, Duy Nguyen wrote:
> On Sun, Dec 9, 2018 at 9:04 PM Thomas Gummerer wrote:
> >
> > The 'git worktree' command used to be just another mode in 'git
> > checkout', namely 'git checkout --to'. When the tests for the latter
> > we
ction will take care of invalidating the path in the cache tree and
in the untracked cache.
This will be useful in a subsequent commit.
Signed-off-by: Thomas Gummerer
---
For the two current callsites, unpack-trees seems to do this
invalidation itself internally. I don't quite understand wh
on,
which which allows us to ignore a non-matching pathspec instead of
erroring out.
In a subsequent commit we're going to start using 'git checkout' in
'git stash' and are going to make use of this feature.
Signed-off-by: Thomas Gummerer
---
builtin/checkout.c|
Factor out the 'unlink_entry()' function from unpack-trees.c to
entry.c. It will be used in other places as well in subsequent
steps.
As it's no longer a static function, also move the documentation to
the header file to make it more discoverable.
Signed-off-by: Thomas Gummere
is
only used in unpack-tree, however we will make use of this in a
subsequent step in the series.
Signed-off-by: Thomas Gummerer
---
entry.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/entry.c b/entry.c
index 3ec148ceee..cd1c6601b6 100644
--- a/entry.c
+++ b/entry.c
@@ -441,6
heckout --overlay -p' to avoid confusing users who would expect
to be able to force overlay mode in 'git checkout -p' this way.
Signed-off-by: Thomas Gummerer
---
builtin/checkout.c | 64 +++---
t/t2025-checkout-no-overlay.sh | 47
, so the --cached option just
mirrors that behaviour. But given it doesn't even deal with
conflicts, the '--cached' option doesn't make much sense when no
is given. As it operates only on the index, it's always a
no-op if no tree-ish is given.
Signed-off-by: Thomas Gummere
Now that we have 'git checkout --no-overlay', we can use it in git
stash, making the codepaths for 'git stash push' with and without
pathspec more similar, and thus easier to follow.
Signed-off-by: Thomas Gummerer
---
As mentioned in the cover letter, not sure if we wa
t sure about is how to deal with conflicts. In
the cached mode this patch series is not dealing with it at all, as
'git checkout -- ' when pathspec matches a file with
conflicts doesn't update the index. For the no-overlay mode, the file
is removed if the corresponding stage is not f
command now. t/README states: "Second digit tells the particular
command we are testing.", so 'git worktree' should have a separate
number just for itself.
Move the worktree tests to t24* to adhere to that guideline. We're
going to make use of the free'd up num
On 11/30, Junio C Hamano wrote:
>
> I am unsure about the wisdom of calling it "--index", though.
>
> The "--index" option is "the command can work only on the index, or
> only on the working tree files, or on both the index and the working
> tree files, and this option tells it to work in the 'b
number of occurrences of the specified block of text (i.e.
addition/deletion) in a file. As we want to keep the current behaviour,
add a test to ensure it.
Signed-off-by: Thomas Braun
---
Changes since v1:
- Merged both patches into one
- Adapted commit messages
- Added missing support for -a
> Ævar Arnfjörð Bjarmason hat am 22. November 2018 um 11:16
> geschrieben:
[...]
> >
> > +test_expect_success 'log -G ignores binary files' '
> > + rm -rf .git &&
> > + git init &&
> > + printf "a\0b" >data.bin &&
> > + git add data.bin &&
> > + git commit -m "message" &&
> > + git
> Junio C Hamano hat am 27. November 2018 um 01:51
> geschrieben:
>
>
> Stefan Beller writes:
>
> > On Wed, Nov 21, 2018 at 1:08 PM Thomas Braun
> > wrote:
> >>
> >> The -G option of log looks for the differences whose patch text
&g
> Junio C Hamano hat am 22. November 2018 um 02:34
> geschrieben:
>
>
> Thomas Braun writes:
>
> > The -S option of log looks for differences that changes the
> > number of occurrences of the specified string (i.e. addition/deletion)
> > in a file.
> Ævar Arnfjörð Bjarmason hat am 22. November 2018 um 10:14
> geschrieben:
>
>
>
> On Wed, Nov 21 2018, Thomas Braun wrote:
>
> > The -S option of log looks for differences that changes the
> > number of occurrences of the specified string (i.e. addition/del
> Ævar Arnfjörð Bjarmason hat am 22. November 2018 um 11:16
> geschrieben:
[...]
> >
> > +test_expect_success 'log -G ignores binary files' '
> > + rm -rf .git &&
> > + git init &&
> > + printf "a\0b" >data.bin &&
> > + git add data.bin &&
> > + git commit -m "message" &&
> > + git
> Jeff King hat am 22. November 2018 um 17:20 geschrieben:
>
>
> On Wed, Nov 21, 2018 at 09:52:27PM +0100, Thomas Braun wrote:
>
> > diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
> > index 69fc55ea1e..8c2558b07d 100644
> > --- a/diffcore-picka
> Junio C Hamano hat am 22. November 2018 um 02:29
> geschrieben:
>
>
> Thomas Braun writes:
>
> > The -G option of log looks for the differences whose patch text
> > contains added/removed lines that match regex.
> >
> > The concept of differences
On 11/27, Johannes Schindelin wrote:
> Hi,
>
> On Sun, 25 Nov 2018, Thomas Gummerer wrote:
>
> > On 11/23, Paul-Sebastian Ungureanu wrote:
> > > Implement `strbuf_insertf()` and `strbuf_vinsertf()` to
> > > insert data using a printf format string.
>
On 11/20, Duy Nguyen wrote:
> On Mon, Nov 19, 2018 at 04:19:53PM +0100, Duy Nguyen wrote:
> > I promise to come back with something better (at least it still
> > sounds better in my mind). If that idea does not work out, we can
> > come back and see if we can improve this.
>
> So this is it. The p
On 11/25, Torsten Bögershausen wrote:
> After running the "Git 2.20-rc1" testsuite here on a raspi,
> the only TC that failed was t5570.
> When the "grep" was run on daemon.log, the file was empty (?).
> When inspecting it later, it was filled, and grep would have found
> the "extended.attribute"
he range-diff and
the new patch of this last round, and this addresses all the comments
I had on v10 (and some more :)). I consider it
Reviewed-by: Thomas Gummerer
> - improved memory management. Now, the callers of `do_create_stash()`
> are responsible of freeing the parameter they pass in. M
On 11/23, Paul-Sebastian Ungureanu wrote:
> Implement `strbuf_insertf()` and `strbuf_vinsertf()` to
> insert data using a printf format string.
>
> Original-idea-by: Johannes Schindelin
> Signed-off-by: Paul-Sebastian Ungureanu
> ---
> strbuf.c | 36
> strbu
Based on the previous discussion in [1] I've prepared patches which teach
log -G to ignore binary files. log -S keeps its behaviour but got a test to
ensure that.
Feedback welcome!
[1]:
https://public-inbox.org/git/7a0992eb-adb9-a7a1-cfaa-3384bc4d3...@virtuell-zuhause.de/
Thomas Bra
The -G option of log looks for the differences whose patch text
contains added/removed lines that match regex.
The concept of differences only makes sense for text files, therefore
we need to ignore binary files when searching with -G as well.
Signed-off-by: Thomas Braun
---
Documentation
-by: Thomas Braun
---
t/t4209-log-pickaxe.sh | 11 +++
1 file changed, 11 insertions(+)
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 42cc8afd8b..d430f6f2f9 100755
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -128,4 +128,15 @@ test_expect_success 'l
Based on the previous discussion in [1] I've prepared patches which teach
log -G to ignore binary files. log -S keeps its behaviour but got a test to
ensure that.
Feedback welcome!
[1]:
https://public-inbox.org/git/7a0992eb-adb9-a7a1-cfaa-3384bc4d3...@virtuell-zuhause.de/
PS: This is the (poss
,your phone and also
your ID for more details on how we can move forward
Waiting to here from you as soon as you receive this massage.
Thanks.
Richard Thomas
sk questions.
[*1*]: https://github.com/git-for-windows/git/blob/master/CONTRIBUTING.md
> Thanks
>
> -Original Message-
> From: Thomas Gummerer
> Sent: 03 November 2018 15:35
> To: Quinn, David
> Cc: git@vger.kernel.org
> Subject: Re: Failed stash caused untracked chan
On 10/23, Quinn, David wrote:
>
> Issue: While running a git stash command including the '-u' flag to include
> untracked files, the command failed due to arguments in the incorrect order.
> After this untracked files the were present had been removed and permanently
> lost.
Thanks for your re
On 10/22, René Scharfe wrote:
> Am 22.10.2018 um 23:10 schrieb Thomas Gummerer:
> > compare_commit_by_gen is used to sort a list of pointers to 'struct
> > commit'. The comparison function for qsort is called with pointers to
> > the objects it needs to compare, so
ever,
currently the comparison function casts it's arguments to 'struct
commit *' and uses those, leading to out of bounds memory access and
potentially to wrong results. Fix that.
Signed-off-by: Thomas Gummerer
---
I noticed this by running the test suite through valgrind. I&#
On 10/16, Johannes Schindelin wrote:
> Hi Thomas,
>
> On Mon, 15 Oct 2018, Thomas Gummerer wrote:
>
> > 2: 63f2e0e6f9 ! 2: 2d45985676 strbuf.c: add `strbuf_join_argv()`
> > @@ -14,19 +14,17 @@
> > strbuf_setlen(sb, sb->len + sb2->len);
&g
On 10/15, Paul-Sebastian Ungureanu wrote:
> Hello,
>
> This is a new iteration of `git stash`, based on the last review.
> This iteration fixes some code styling issues, bring some changes
> to `do_push_stash()` and `do_create_stash()` to be closer to API by
> following Thomas
On 10/15, Paul-Sebastian Ungureanu wrote:
> The `-m` option is no longer supported as it might not make
> sense to have two ways of passing a message. Even if this is
> a change in behaviour, the documentation remains the same
> because the `-m` parameter was omitted before.
[...]
> +
On 10/15, Paul-Sebastian Ungureanu wrote:
> 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--hel
uot;, revision) ||
> > + get_oidf(&info->w_tree, "%s:", revision) ||
> > + get_oidf(&info->b_tree, "%s^1:", revision) ||
> > + get_oidf(&info->i_tree, "%s^2:", revision)) {
> > + error(_("
On 10/12, Farhan Khan wrote:
> Hi all,
>
> Does git load the entire index file into memory when it wants to
> edit/view it? I ask because I wonder if this can become a problem with
> the index file becomes arbitrarily large, like for the Linux kernel.
Yes, currently git always loads the entire in
On 10/12, Jonathan Nieder wrote:
> Jeff King wrote:
> > On Fri, Oct 12, 2018 at 07:40:37PM +0100, Thomas Gummerer wrote:
>
> >> 801fa63a90 ("config.mak.dev: add -Wformat-security", 2018-09-08) added
> >> the -Wformat-security to the flags set in config.ma
Fix that, and make -Wformat-security actually useful by adding the
-Wformat flag as well. git compiles cleanly with both these flags
applied.
Signed-off-by: Thomas Gummerer
---
Sorry for not catching this before the patch made it to next.
config.mak.dev | 1 +
1 file changed, 1 insertio
On 10/10, Junio C Hamano wrote:
> * ps/stash-in-c (2018-08-31) 20 commits
> - stash: replace all `write-tree` child processes with API calls
> - stash: optimize `get_untracked_files()` and `check_changes()`
> - stash: convert `stash--helper.c` into `stash.c`
> - stash: convert save to builtin
>
Am 17.09.2018 um 17:58 schrieb Jonathan Nieder:
[...]
> Ah, thanks. See git-config(1):
>
> core.bigFileThreshold
> Files larger than this size are stored deflated,
> without attempting delta compression.
>
> Default is 512 MiB on all platforms.
>
On 09/26, Paul-Sebastian Ungureanu wrote:
> 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--hel
On 09/26, Paul-Sebastian Ungureanu wrote:
> 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
On 09/26, Paul-Sebastian Ungureanu wrote:
> 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(-)
>
> dif
> Subject: stash: mention options in `show` synopsis.
Really minor point, but the '.' in the end should be dropped.
Also as this is fixing a pre-existing problem I would have put this
patch near the beginning of the series, rather than in between
conversions of functions, and just incorporated th
On 09/26, Paul-Sebastian Ungureanu wrote:
> 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
On 09/26, Paul-Sebastian Ungureanu wrote:
> 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
> Subject: stash: update test cases conform to coding guidelines
s/stash/t3903/
s/conform/to &/
Alternatively the subject could also be "t3903: modernize style",
which would be a bit shorter, and still convey the same information to
a reader of 'git log --oneline'.
On 09/26, Paul-Sebastian Ungur
On 09/26, Paul-Sebastian Ungureanu wrote:
> 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
> in
On 09/27, Ruud van Asseldonk wrote:
> Hi,
>
> I just ran into a segmentation fault during a rebase with rerere
> enabled. Inspecting the core dump with gdb shows:
Thanks for reporting this bug
> (gdb) bt
> #0 0x55d673375ce0 in do_rerere_one_path (update=0x7fff03c37f30,
> rr_item=0x55d6746d0
On 09/26, Derrick Stolee wrote:
> This is a bit tricky to do, but I will investigate. For some things, the
> values can conflict with each other (GIT_TEST_SPLIT_INDEX doesn't play
> nicely with other index options, I think).
Just commenting on this point. I think all the index options should
be p
rl versions > 7.61.1 and
earlier curl versions.
Reported-by: Todd Zullinger
Helped-by: Jonathan Nieder
Signed-off-by: Thomas Gummerer
---
t/t5551-http-fetch-smart.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-sm
Thanks Jonathan and Junio for the comments on the first round.
Changes since the first round:
- add a preparatory patch to modernize the test script
- add Reported-by to credit Todd
- just use 'sort' instead of 'cat | sort'
Thomas Gummerer (2):
t5551: move setup code insid
Move setup code inside test_expect blocks, to catch unexpected
failures in the setup steps, and bring the test scripts in line with
our modern test style.
Suggested-by: Jonathan Nieder
Signed-off-by: Thomas Gummerer
---
t/t5551-http-fetch-smart.sh | 66 ++---
1
On 09/17, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > In t5551 we check that we save cookies correctly to a file when
> > http.cookiefile and http.savecookies are set. To do so we create an
> > expect file that expects the cookies in a certain order.
> &g
rl versions > 7.61.1 and
earlier curl versions.
Signed-off-by: Thomas Gummerer
---
t/t5551-http-fetch-smart.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 771f36f9ff..d13b993201 100755
--- a/t/t5551-ht
augmenting path
algorithm for dense and sparse linear assignment
problems. Computing, 38(4), 325–340.
Reported-by: ryenus
Helped-by: Derrick Stolee
Signed-off-by: Thomas Gummerer
---
linear-assignment.c | 6 ++
t/t3206-range-diff.sh | 5 +
2 files changed, 11 insert
On 09/12, Johannes Schindelin wrote:
> Hi Thomas,
>
> [quickly, as I will go back to a proper vacation after this]
Sorry about interrupting your vacation, enjoy wherever you are! :)
> On Wed, 12 Sep 2018, Thomas Gummerer wrote:
>
> > diff --git a/linear-assignment.c
On 09/13, Ben Peart wrote:
>
>
> On 9/12/2018 6:31 PM, Thomas Gummerer wrote:
> > On 09/12, Ben Peart wrote:
> > > Teach get_index_format_default() to support running the test suite
> > > with specific index versions. In particular, this enables the test
On 09/12, Junio C Hamano wrote:
> Thomas Gummerer writes:
> > --- >8 ---
> >
> > Subject: [PATCH] linear-assignment: fix potential out of bounds memory
> > access
> >
> > Currently the 'compute_assignment()' function can may read memory out
On 09/12, Ben Peart wrote:
> Teach get_index_format_default() to support running the test suite
> with specific index versions. In particular, this enables the test suite
> to be run using index version 4 which is not the default so gets less testing.
I found this commit message slightly misleadi
On 09/11, Thomas Gummerer wrote:
> On 09/11, Thomas Gummerer wrote:
> > I think you're on the right track here. I can not test this on Mac
> > OS, but on Linux, the following fails when running the test under
> > valgrind:
> >
> > diff --git a/t/t3206
On 09/11, Thomas Gummerer wrote:
> I think you're on the right track here. I can not test this on Mac
> OS, but on Linux, the following fails when running the test under
> valgrind:
>
> diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
> index 2237c7
On 09/11, Derrick Stolee wrote:
> On 9/11/2018 12:04 PM, Derrick Stolee wrote:
> > On 9/11/2018 11:38 AM, Derrick Stolee wrote:
> > The patch below includes a test that fails on Mac OSX with a segfault.
> >
> > GitGitGadget PR: https://github.com/gitgitgadget/git/pull/36
> > Failed Build:
> > htt
Hi,
thanks for your bug report!
On 09/11, ryenus wrote:
> I just updated to 2.19 via Homebrew, git range-diff seems cool, but I
> only got a Segmentation fault: 11
>
> $ git version; git range-diff origin/master HEAD@{2} HEAD
Unfortunately the HEAD@{2} syntax needs your reflog, which is no
16 mysubmod
Switched to a new branch 'mybranch'
M mysubmod
fatal: Unexpected stash response: ''
and that used to work with older git versions.
Thanks for reading,
Thomas
[1]:
https://github.com/git-for-windows/git/issues/1820#issuecomment-419411808
hi,
i just ran into this little possible bug but cant pin it down any further as it
happens against a git repo for work project that i cant share.
when i run this git log against my repo i get this wrong sort order (1st col is
authored date and 2nd is commit date):
$ git log --author=menzel --
On 08/29, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > Yeah that makes sense. Maybe something like this?
> >
> > (replying to here to keep
> > the patches in one thread)
> >
> > Documentation/technical/rerere.txt | 4
> > 1 fi
On 08/27, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > Agreed. I think it may be solvable if we'd actually get the
> > information about what belongs to which side from the merge algorithm
> > directly.
>
> The merge machinery may (eh, rather, "
When a file contains lines that look like conflict markers, 'git
rerere' may fail not be able to record a conflict resolution.
Emphasize that in the man page, and mention a possible workaround for
the issue.
Suggested-by: Junio C Hamano
Signed-off-by: Thomas Gummerer
---
Compared t
t deal with any unmatched conflict markers. Make that clearer
in the documentation.
Suggested-by: Junio C Hamano
Signed-off-by: Thomas Gummerer
---
> That's fine. I'd rather keep it but perhaps add a reminder to tell
> readers that it works only when the merging of contents th
cumentation might be misleading to users, in case we change the
heuristic in the future.
Remove this documentation to avoid being potentially misleading in the
documentation.
Suggested-by: Junio C Hamano
Signed-off-by: Thomas Gummerer
---
The original series already made it into 'next',
When a file contains lines that look like conflict markers, 'git
rerere' may fail not be able to record a conflict resolution.
Emphasize that in the man page.
Helped-by: Junio C Hamano
Signed-off-by: Thomas Gummerer
---
Not sure if there may be a better place in the man page for this
On 08/22, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > Hmm, it does describe what happens in the code, which is what this
> > patch implements. Maybe we should rephrase the title here?
> >
> > Or are you suggesting dropping this patch (and the next one)
&g
On 08/22, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
> > But why not add this to the git-rerere manpage? These technical docs
> > get way less exposure, and in this case we're not describing some
> > interna implementation detail, which the technical docs are for, but
> > something
On 08/08, Paul-Sebastian Ungureanu wrote:
> `apply_all_patches()` does not provide a method to apply patches
> from strbuf. Because of this, this commit introduces a new
> function `apply_patch_from_buf()` which applies a patch from buf.
> It works by saving the strbuf as a file. This way we can ca
On 08/08, Paul-Sebastian Ungureanu wrote:
> This commit replaces spawning `git write-tree` with API calls.
> ---
> builtin/stash.c | 40
> 1 file changed, 12 insertions(+), 28 deletions(-)
Nice reduction in lines here!
>
> diff --git a/builtin/stash.c b/
On 08/08, Paul-Sebastian Ungureanu wrote:
> 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()`
> * `do_create_stash()`, which calls: `check_changes()`
On 08/08, Paul-Sebastian Ungureanu wrote:
> This commit replaces spawning `git ls-files` child process with
> API calls to get the untracked files.
> ---
> builtin/stash--helper.c | 49 +++--
> 1 file changed, 32 insertions(+), 17 deletions(-)
>
> diff --git a/
On 08/08, Paul-Sebastian Ungureanu wrote:
> This commits replaces spawning `diff-index` child process by using
> the already existing `diff` API
I think this should be squashed into the previous commit. It's easier
to review a commit that replaces all the 'run_command'/'pipe_command'
calls in one
On 08/08, Paul-Sebastian Ungureanu wrote:
> Instead of spawning a child process, make use of `reset_tree()`
> function already implemented in `stash-helper.c`.
> ---
> builtin/stash--helper.c | 9 +++--
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/stash--helper.c
On 08/18, Paul Sebastian Ungureanu wrote:
> On Thu, Aug 16, 2018 at 1:13 AM, Thomas Gummerer wrote:
> > On 08/08, Paul-Sebastian Ungureanu wrote:
> >>
> >> [...]
> >>
> >> + r
On 08/08, Paul-Sebastian Ungureanu wrote:
> 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--hel
On 08/08, Paul-Sebastian Ungureanu wrote:
> 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()`).
> ---
> builtin/stash--helper.c | 48 +++
>
On 08/08, Paul-Sebastian Ungureanu wrote:
> This commit introduces more tests for the quiet option of
> `git stash push`.
I think this commit should be squashed into the previous one, so we
have implementation and tests in one commit. That way it's easier to
see during review that there are tests
> 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 shell version of stash w
On 08/08, Paul-Sebastian Ungureanu wrote:
> Add stash push to the helper.
> ---
This (and the previous two and I think most subsequent patches) are
missing your sign-off.
> builtin/stash--helper.c | 209
> git-stash.sh| 6 +-
> 2 files chang
On 08/15, Elia Pinto wrote:
> Add the '--quiet' option to git worktree,
> as for the other git commands. 'add' is the
> only command affected by it since all other
> commands, except 'list', are currently
> silent by default.
>
> Helped-by: Martin Ågren
> Helped-by: Duy Nguyen
> Helped-by: Eric
On 08/08, Paul-Sebastian Ungureanu wrote:
> Hello,
>
> Here is the whole `git stash` C version. Some of the previous
> patches were already reviewed (up to and including "stash: convert
> store to builtin"), but there are some which were not
> (starting with "stash: convert create to builtin").
T
On 08/08, Paul-Sebastian Ungureanu wrote:
> Add stash create to the helper.
>
> Signed-off-by: Paul-Sebastian Ungureanu
> ---
> builtin/stash--helper.c | 406
> git-stash.sh| 2 +-
> 2 files changed, 407 insertions(+), 1 deletion(-)
>
> dif
On 08/08, Paul-Sebastian Ungureanu wrote:
> Add stash store to the helper and delete the store_stash function
> from the shell script.
>
> Add the usage string which was forgotten in the shell script.
I think similarly to 'git stash create', which also doesn't appear in
the usage, this was intent
On 08/08, Paul-Sebastian Ungureanu wrote:
> Add in documentation about the change of behavior regarding
> the `--quiet` option, which was introduced in the last commit.
> (the `--quiet` option does not exit anymore with erorr if it
s/erorr/error/
> is given an empty stash as argument)
If we want
On 08/08, Paul-Sebastian Ungureanu wrote:
> Currently, `show_stash()` uses `cmd_diff()` to generate
> the output. After this commit, the output will be generated
> using the internal API.
>
> Before this commit, `git stash show --quiet` would act like
> `git diff` and error out if the stash is not
301 - 400 of 2383 matches
Mail list logo
