Hello all,
When the "git add -i" command is triggered with a clean working
directory and index, the outputs of the various options don't seem to
be giving consistent results. A few of the distinct outputs are,
1. No output, the options are displayed
2. A single blank line and the options are displ
I guess I'll take back my note in the previous email that says, I could
help. I saw the implementation and found that I couldn't help as I
don't have experience with PERL. My bad.
From: "Junio C Hamano"
"Philip Oakley" writes:
The git book [1] and a few blog posts [2] show how to preserve files
which
are in the current branch against changes that are on the branch being
merged in.
e.g. (from [2])
echo ' merge=ours' >> .gitattributes && # commit
git config --global m
On Sat, May 27, 2017 at 11:46 PM, Jeff King wrote:
> On Sat, May 27, 2017 at 06:57:08PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> There's another test which breaks if we just s/gmtime/localtime/g. As
>> far as I can tell to make the non-local case work we'd need to do a
>> whole dance where we se
From: "Kaartic Sivaraam"
I guess I'll take back my note in the previous email that says, I could
help. I saw the implementation and found that I couldn't help as I
don't have experience with PERL. My bad.
I wouldn't let that stop you. We were all ignorant once.
I know little of tcl (gitk/git-g
From: "Junio C Hamano"
"Philip Oakley" writes:
However given the discussion about an unborn HEAD, the option here
would be to also pass the NULL sha for the symref and then add the
annotation 'HEAD' after an extra \0, in the same way that an active
symref could be annotated with the '\0HEAD'.
Am 27.05.2017 um 23:46 schrieb Jeff King:
> On Sat, May 27, 2017 at 06:57:08PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> There's another test which breaks if we just s/gmtime/localtime/g. As
>> far as I can tell to make the non-local case work we'd need to do a
>> whole dance where we set the TZ
Add missing completions for git config:
* commit.cleanup
* commit.gpgSign
* commit.verbose
Signed-off-by: Rikard Falkeborn
---
contrib/completion/git-completion.bash | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completio
Hello, $850,000 has been donate to you,
kindly get back to us via: maureendav...@outlook.com
ü Mielőtt kinyomtatja ezt az e-mailt, gondoljon a környezetre. P Please
consider the environment before printing this email.
***
Ezt az emailt a Websense ESG ellenőrizte a BKV
"Philip Oakley" writes:
> From: "Junio C Hamano"
>> "Philip Oakley" writes:
>>
>>> However given the discussion about an unborn HEAD, the option here
>>> would be to also pass the NULL sha for the symref and then add the
>>> annotation 'HEAD' after an extra \0, in the same way that an active
>>
"Philip Oakley" writes:
>> So I do not think this is not limited to "new file". Anything that
>> a tree-level three-way merge would resolve cleanly without having to
>> consult the content-level three-way merge will complete without
>> consulting the merge.ours.driver; per-file content-level thr
On Sun, 2017-05-28 at 11:39 +0100, Philip Oakley wrote:
> I wouldn't let that stop you. We were all ignorant once.
> I know little of tcl (gitk/git-gui), but I've still managed to fix a
> couple
> of issues, with the help of others on the list (and the search
> engines and
> their results;-)
>
T
First: `git rev-parse --short` without a number does use a fixed default but
`core.abbrev` which in turn uses `find_unique_abbrev` internally.
Second: `--short` implies `--verify` since the beginning (d50125085a), so
it cannot be used for bulk-shortening ids unfortunately.
Signed-off-by: Andreas
Ensure the command gives the correct return code
Signed-off-by: Joel Teichroeb
---
t/t3903-stash.sh | 8
1 file changed, 8 insertions(+)
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 3b4bed5c9a..aaae221304 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -444,6 +444,14
I've rewritten git stash as a builtin c command. All tests pass,
and I've added two new tests. Test coverage is around 95% with the
only things missing coverage being error handlers.
Joel Teichroeb (4):
stash: add test for stash create with no files
stash: add test for stashing in a detached s
Signed-off-by: Joel Teichroeb
---
builtin/add.c | 3 ++-
builtin/mv.c | 8 +---
builtin/rm.c | 3 ++-
merge-recursive.c | 8 +---
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index 9f53f020d0..6b04eb2c71 100644
--- a/builtin/a
Signed-off-by: Joel Teichroeb
---
t/t3903-stash.sh | 11 +++
1 file changed, 11 insertions(+)
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index aaae221304..b86851ef46 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -808,6 +808,17 @@ test_expect_success 'create with multiple
Implement all git stash functionality as a builtin command
Signed-off-by: Joel Teichroeb
---
Makefile |2 +-
builtin.h |1 +
builtin/stash.c | 1280 +
git-stash.
Fixes the test by changing "branch.s/s/dummy" to "branch.s/s.dummy" which is
the right way of accessing config key "branch.s/s.dummy". Purpose of
this test is to confirm that this key doesn't exist after the branch
"s/s" has been renamed to "s".
Earlier it was trying to access invalid config key a
On Sun, May 28, 2017 at 7:12 PM, Sahil Dua wrote:
> Fixes the test by changing "branch.s/s/dummy" to "branch.s/s.dummy" which is
> the right way of accessing config key "branch.s/s.dummy". Purpose of
> this test is to confirm that this key doesn't exist after the branch
> "s/s" has been renamed to
On Sun, May 28, 2017 at 6:56 PM, Joel Teichroeb wrote:
> Ensure the command gives the correct return code
>
> Signed-off-by: Joel Teichroeb
> ---
> t/t3903-stash.sh | 8
> 1 file changed, 8 insertions(+)
>
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index 3b4bed5c9a..aaae221304
On Sun, May 28, 2017 at 6:56 PM, Joel Teichroeb wrote:
> Signed-off-by: Joel Teichroeb
> ---
> builtin/add.c | 3 ++-
> builtin/mv.c | 8 +---
> builtin/rm.c | 3 ++-
> merge-recursive.c | 8 +---
> 4 files changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/builtin/
On Sun, May 28, 2017 at 6:56 PM, Joel Teichroeb wrote:
[...]
> +int untracked_files(struct strbuf *out, int include_untracked,
> + const char **argv)
> +{
> + struct child_process cp = CHILD_PROCESS_INIT;
> + cp.git_cmd = 1;
> + argv_array_push(&cp.args, "ls-files
On Sun, May 28, 2017 at 6:56 PM, Joel Teichroeb wrote:
> Signed-off-by: Joel Teichroeb
> ---
> t/t3903-stash.sh | 11 +++
> 1 file changed, 11 insertions(+)
>
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index aaae221304..b86851ef46 100755
> --- a/t/t3903-stash.sh
> +++ b/t/t3903
On Sun, May 28, 2017 at 6:56 PM, Joel Teichroeb wrote:
> Implement all git stash functionality as a builtin command
First thanks for working on this, it's great. Applied it locally,
passes all tests for me. A couple of comments Christian didn't cover
> + info->has_u = get_sha1_with_context
On Sun, May 28, 2017 at 11:26 AM, Ævar Arnfjörð Bjarmason
wrote:
> On Sun, May 28, 2017 at 6:56 PM, Joel Teichroeb wrote:
>> Implement all git stash functionality as a builtin command
>
> First thanks for working on this, it's great. Applied it locally,
> passes all tests for me. A couple of comm
On Sun, May 28, 2017 at 6:56 PM, Joel Teichroeb wrote:
> Implement all git stash functionality as a builtin command
>
> Signed-off-by: Joel Teichroeb
> ---
General note on this that I missed in my first E-Mail, you have ~20
calls to argv_array_init() but none to argv_array_clear(). So you're
lea
On Sun, May 28, 2017 at 6:56 PM, Joel Teichroeb wrote:
> I've rewritten git stash as a builtin c command. All tests pass,
> and I've added two new tests. Test coverage is around 95% with the
> only things missing coverage being error handlers.
Worth noting, with your patches the best of 3 run of
On Sun, May 28, 2017 at 08:51:07PM +0200, Ævar Arnfjörð Bjarmason wrote:
> On Sun, May 28, 2017 at 6:56 PM, Joel Teichroeb wrote:
> > Implement all git stash functionality as a builtin command
> >
> > Signed-off-by: Joel Teichroeb
> > ---
>
> General note on this that I missed in my first E-Mai
On Sun, May 28, 2017 at 11:31:48AM -0700, Joel Teichroeb wrote:
> >> + /* TODO: Improve this logic */
> >> + strbuf_addf(&symbolic, "%s", REV);
> >> + str = strstr(symbolic.buf, "@");
> >
> > Could you elaborate on how this should be improved?
>
> I just figured there would be a
New feature - copying a branch along with its config section.
Aim is to have an option -c for copying a branch just like -m option for
renaming a branch.
This commit adds a few basic tests for getting any suggestions/feedback
about expected behavior for this new feature.
Signed-off-by: Sahil Dua
On Mon, May 29, 2017 at 12:56 AM, Sahil Dua wrote:
> New feature - copying a branch along with its config section.
>
> Aim is to have an option -c for copying a branch just like -m option for
> renaming a branch.
>
> This commit adds a few basic tests for getting any suggestions/feedback
> about e
pull --rebase --autostash was failing on a fast-forward in a dirty repo
since we shortcut to run_merge(), which does not know how to autostash.
The shortcut is a performance optimization, and since rebase was
rewritten in C, it seemed okay to just bypass the shortcut if we
autostash.
---
builtin/p
Jeff King writes:
> On Fri, May 26, 2017 at 07:36:54PM +0200, Andreas Heiduk wrote:
>
>> The function `set_ident` in `filter-branch` exported the variables
>> GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL|DATE) at least since 6f6826c52b in 2007.
>> Therefore the filter scripts don't need to re-eport them ag
Ævar Arnfjörð Bjarmason writes:
>>
>> Here are some links to past explorations:
>>
>> http://public-inbox.org/git/20160208152858.ga17...@sigill.intra.peff.net/
>>
>> http://public-inbox.org/git/87vb2d37ea@web.de/
>
> There's a third and possibly least shitty option that isn't covered in
>
Thanks. Did you run "sort | uniq -c" on it or something ;-)?
Will apply.
Adrian writes: (nothing)
Imagine a reader who finds the title of this commit in 3 weeks from
now among 200 other commits. Do you think the reader can guess that
this is a documentation fix? Can the reader tell this is about
"stash"?
Subject: stash doc: write explanation as comments, not as
Ævar Arnfjörð Bjarmason writes:
> diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
> index 4f94fc7574..c76bbedf86 100755
> --- a/GIT-VERSION-GEN
> +++ b/GIT-VERSION-GEN
> @@ -37,4 +37,5 @@ fi
> test "$VN" = "$VC" || {
> echo >&2 "GIT_VERSION = $VN"
> echo "GIT_VERSION = $VN" >$GVF
> +
Ævar Arnfjörð Bjarmason writes:
> On Sun, May 28, 2017 at 7:12 PM, Sahil Dua wrote:
>> Fixes the test by changing "branch.s/s/dummy" to "branch.s/s.dummy" which is
>> the right way of accessing config key "branch.s/s.dummy". Purpose of
>> this test is to confirm that this key doesn't exist after
On Fri, May 26, 2017 at 2:37 PM, Jeff King wrote:
>
> On Fri, May 26, 2017 at 07:36:54PM +0200, Andreas Heiduk wrote:
>
> > The function `set_ident` in `filter-branch` exported the variables
> > GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL|DATE) at least since 6f6826c52b in 2007.
> > Therefore the filter sc
Sahil Dua writes:
> New feature - copying a branch along with its config section.
That's an unusual non-sentence (without a verb) in our commit message.
> Aim is to have an option -c for copying a branch just like -m option for
> renaming a branch.
What should it copy literally, and what shoul
Tyler Brazier writes:
> pull --rebase --autostash was failing on a fast-forward in a dirty repo
> since we shortcut to run_merge(), which does not know how to autostash.
> The shortcut is a performance optimization, and since rebase was
> rewritten in C, it seemed okay to just bypass the shortcut
Hello,
My SPARC build does not function and seg bus terminates on any command.
I have worked out the commit is the one that switched the default SHA1
code to sha1dc - commit e6b07da2780f349c29809bd75d3eca6ad3c35d19. I
managed to get it working by following the instructions on updating the
library
John Shahid writes:
> It looks like the git push recurse-submodules behavior has changed.
> Currently with 2.13 you cannot run "git push
> --recurse-submodules=on-demand" if the parent repo is on a different
> branch than the sub repos, e.g. parent repo is on "develop" and
> sub-repo on "master".
#104 Lambert avenue 144/150 Adoglita
Cotonou Republic Du Benin.
Tel: 229. 5654.56 77
Attention:Sir/Madam
Your overdue payment sum of $3,500,000.00 USD has been released today from
Federal High Court Benin and we are hereby to let you know that the first
payment of $5000 with the MTCN: (156-673-
"Liam R. Howlett" writes:
> My SPARC build does not function and seg bus terminates on any command.
Sorry, known issue in the released version 2.13 (we would have
appreciated if a bug report for -rc1 came way before the decision to
tag the final release).
A fix exists on 'pu' (you can merge or
On Sun, May 28, 2017 at 09:35:30PM -0400, Samuel Lijin wrote:
> > However, I think POSIX mandates the behavior you'd expect. And the only
> > shell I know that misbehaves in this way is Solaris /bin/sh, which we
> > have already declared too broken to support.
>
> Off-topic, but where is this exp
On Sun, May 28, 2017 at 7:44 PM, Junio C Hamano wrote:
> John Shahid writes:
>
>> It looks like the git push recurse-submodules behavior has changed.
>> Currently with 2.13 you cannot run "git push
>> --recurse-submodules=on-demand" if the parent repo is on a different
>> branch than the sub repo
Samuel Lijin writes:
>> However, I think POSIX mandates the behavior you'd expect. And the only
>> shell I know that misbehaves in this way is Solaris /bin/sh, which we
>> have already declared too broken to support.
>
> Off-topic, but where is this explicitly documented?
One link I had readily
On Mon, May 29, 2017 at 01:27:45PM +0900, Junio C Hamano wrote:
> Samuel Lijin writes:
>
> >> However, I think POSIX mandates the behavior you'd expect. And the only
> >> shell I know that misbehaves in this way is Solaris /bin/sh, which we
> >> have already declared too broken to support.
> >
>
Johannes Schindelin writes:
> diff --git a/sequencer.c b/sequencer.c
> index 130cc868e51..88819a1a2a9 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -2388,3 +2388,52 @@ void append_signoff(struct strbuf *msgbuf, int
> ignore_footer, unsigned flag)
>
> strbuf_release(&sob);
> }
> +
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
A bit more topics are now in 'mast
Ævar Arnfjörð Bjarmason writes:
>> + git stash create > actual &&
>> + test $(cat actual | wc -l) -eq 0
> ...
> Although I wonder in this case whether you don't actually mean:
>
> [...]>actual &&
> ! test -s actual
>
> I.e. isn't the test that there should be no output, not th
Joel Teichroeb writes:
> Signed-off-by: Joel Teichroeb
> ---
> t/t3903-stash.sh | 11 +++
> 1 file changed, 11 insertions(+)
>
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index aaae221304..b86851ef46 100755
> --- a/t/t3903-stash.sh
> +++ b/t/t3903-stash.sh
> @@ -808,6 +808,17 @
Joel Teichroeb writes:
> Signed-off-by: Joel Teichroeb
> ---
The title says what the patch does; it does not explain why it is a
good change. Lockfiles will be closed automatically when we exit
anyway, so one can argue that the current code is good.
If you are planning to add more code to the
55 matches
Mail list logo
