On Fri, Oct 26, 2018 at 08:43:37AM +0900, Junio C Hamano wrote:
> Jeff King writes:
>
> > An easy test is:
> >
> > $ git rev-list --no-walk --exclude='*' --all --all
> > 3289ca716320457af5d2dd550b716282ad22da11
> > ...a bunch of other tip commits...
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David Lu
Signed-off-by: Ryan Wang
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib
Jeff King writes:
> An easy test is:
>
> $ git rev-list --no-walk --exclude='*' --all --all
> 3289ca716320457af5d2dd550b716282ad22da11
> ...a bunch of other tip commits...
>
> $ git rev-parse --exclude='*' --all --all
> [no output, but it should print th
Keep the properties introduced in 10f5c52656 (submodule: avoid
auto-discovery in prepare_submodule_repo_env(), 2016-09-01), by fixating
the git directory of the submodule.
Signed-off-by: Stefan Beller
---
submodule.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git
All,
I recently needed to extract the git history of a portion of an existing
repository. My initial attempts using --subdirectory-filter, subtrees,
etc weren't as successful as I'd hoped.
The primary reason for my failures were due to the fact that this
particular source repository has seen
808690ea245708fb80383be5c1afee2fb3eb (add, reset: ensure
> > submodules can be added or reset).
Uh. :(
See the discussion starting at
https://public-inbox.org/git/20170725213928.125998-4-bmw...@google.com/
specifically
https://public-inbox.org/git/xmqqinieq49v@gitster.mtv.corp.goo
r reset).
>
> Here is a demonstration of the problem:
>
> First some repository initialization with a submodule marked as ignored.
>
> $ git init inner && git -C inner commit --allow-empty -m 'inner 1'
> Initialized empty Git repository in /tmp/inner/.git/
> [master (root
On the newest version of Git available via Homebrew (2.19.1), when the
gui tool needs to repaint the screen (refresh a file, change a focused
file, stage files) the window that is repainted flashes a dark gray
before returning to white. This was not occurring on High Sierra
yesterday, but has
I noticed that the piped output still prints the (HEAD -> ) :
git log --pretty=format:"%d*%B" --decorate-refs='refs/tags/*'
*bar
(tag: "123")*foo
git log --pretty=format:"%d*%B" --decorate-refs='refs/tags/*' > tmp.tmp
(HEAD -> branch)*bar
(tag:
after 36da893114 ("config.mak.dev: enable -Wunused-function", 2018-10-18)
it is expected to be used to prevent -Wunused-function warnings for code
that was macro generated
Signed-off-by: Carlo Marcelo Arenas Belón
Signed-off-by: Junio C Hamano
---
commit-slab-impl.h | 4 +---
git-com
Yeah. I think this is just a bug in 9dc01bf063 (rev-parse: introduce
--exclude= to tame wildcards, 2013-11-01), in that it's handling
of --all differed from e7b432c521 (revision: introduce --exclude=
to tame wildcards, 2013-08-30). The clearing is very much intentional
and documented, and in g
Tommi Vainikainen writes:
> After reading SubmittingPatches I didn't find if I should now send a
> fresh patch with
> changes squashed together or new commits appended after first commit in that
> patch. Patch is updated accordingly as fresh patch.
(just on mechanics, not on the contents of
script, but it's never installed in the users's
> $PATH and is more of an internal implementation detail. Git Cola
> includes a GIT_SEQUENCE_EDITOR-compatible "git-xbase" command that
> provides a visual interactive rebase feature. That command should
> probably be renamed to &quo
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David Lu
Signed-off-by: Ryan Wang
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib
In fact, per
https://github.com/git/git/commit/859b7f1d0e742493d2a9396794cd9040213ad846,
having only a negative pattern is like having a catch-all positive
pattern and the negative pattern (since git 2.13.0).
Thus, adding the positive pattern yields the same results:
> git --no-pager grep
On Wed, Oct 24, 2018 at 4:55 PM Christophe Bliard
wrote:
>
> Hi,
>
> I observed an unexpected behavior while using git grep with both git
> 2.19.1 and 2.14.3. Here is how to reproduce it:
>
> > git init
> Initialized empty Git repository in /private/tmp/hello/.git/
&g
Hi,
I observed an unexpected behavior while using git grep with both git
2.19.1 and 2.14.3. Here is how to reproduce it:
> git init
Initialized empty Git repository in /private/tmp/hello/.git/
> echo foo > fileA
> echo 'foo is false+' > fileB
> git add fileA
> git commit -
f the existing infrastructure
for grabbing P4 changes.
However, in most cases we will already have these files present in the
git repo - it's just that we don't know where. I think it ought to be
possible to look at the revisions of each file, and then search
through the git revision history for
Hi everyone,
The 44th edition of Git Rev News is now published:
https://git.github.io/rev_news/2018/10/24/edition-44/
Enjoy,
Christian, Jakub, Markus and Gabriel.
On Wed, 24 Oct 2018 at 11:24, Junio C Hamano wrote:
> Andreas Gruenbacher writes:
> >> All other glob options do show_reference with for_each_ref_in() and
> >> then calls clear_ref_exclusion(), and logically the patch makes
> >> sense.
> >>
> >> What is the "problem" this patch fixes, though?
Andreas Gruenbacher writes:
>> All other glob options do show_reference with for_each_ref_in() and
>> then calls clear_ref_exclusion(), and logically the patch makes
>> sense.
>>
>> What is the "problem" this patch fixes, though? Is it easy to add a
>> new test to t/6018-rev-list-glob.sh to
On Wed, 24 Oct 2018 at 06:35, Junio C Hamano wrote:
> Andreas Gruenbacher writes:
>
> > Commit [1] added the --exclude option to revision.c. The --all,
> > --branches, --tags, --remotes, and --glob options clear the exclude
> > list. Shortly therafter, commit [2] ad
On Tue, Sep 18, 2018 at 02:22:22PM -0400, Jeff King wrote:
> On Mon, Sep 17, 2018 at 11:25:31AM +0200, Christian Couder wrote:
>
> > > (Also, to be clear, this is all _only_ about "Git Cola". The "git-cola"
> > > command is explicitly OK in the p
Stefan Beller writes:
>> You would want to be able to remove a submodule and replace it with
>> a directory, but you can probably do it in two steps, i.e.
>>
>> git reset --hard
>> git rm --cached sha1collisiondetection
>> echo Now a
PATCH] pull: obey fetch.recurseSubmodules when fetching
"git pull" now uses same recurse-submodules config for fetching as "git
fetch" by default if not overridden from command line.
The command line arg --recurse-submodules=no overrides
fetch.recurseSubmodules configurati
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David Lu
Signed-off-by: Ryan Wang
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib
ke 24. lokak. 2018 klo 0.57 Stefan Beller (sbel...@google.com) kirjoitti:
> On Tue, Oct 23, 2018 at 2:04 PM Tommi Vainikainen wrote:
> > I would expect that if git-config has fetch.recurseSubmodules set,
> > also git pull should use this setting, or at least similar option such
Andreas Gruenbacher writes:
> Commit [1] added the --exclude option to revision.c. The --all,
> --branches, --tags, --remotes, and --glob options clear the exclude
> list. Shortly therafter, commit [2] added the same to 'git rev-parse',
> but without clearing the exclude list f
On Mon, Oct 22, 2018 at 10:11:50AM +0200, Ralf Jung wrote:
> Hi all,
>
> I have been repeatedly bitten by the default behavior of `git stash` to stash
> not just the unstaged but also the staged changes, and then `git stash pop`
> making all changes unstaged. This means `git sta
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David Lu
Signed-off-by: Ryan Wang
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib
On Wed, Oct 24, 2018 at 12:04:06AM +0300, Tommi Vainikainen wrote:
> I configured my local git to fetch with recurseSubmodules = on-demand,
> which I found the most convenient setting. However then I noticed that
> I mostly use git pull actually to fetch from remotes, but git pu
On Tue, Oct 23, 2018 at 3:55 PM Jonathan Tan wrote:
> > When adding the comment here, we'd also want to have
> > the comment in prepare_submodule_repo_env, which
> > could be its own preparation commit.
>
> I agree with the protection. As for the preparation commit, I don't
> think it's always
> > Why does GIT_DIR need to be set? Is it to avoid subcommands recursively
> > checking the parent directories in case the CWD is a malformed Git
> > repository? If yes, maybe it's worth adding a comment.
>
> It is copying the structure from prepare_submodule_repo_env,
&
On Tue, Oct 23, 2018 at 2:04 PM Tommi Vainikainen wrote:
>
> I configured my local git to fetch with recurseSubmodules = on-demand,
> which I found the most convenient setting. However then I noticed that
> I mostly use git pull actually to fetch from remotes, but git pull
> does
I configured my local git to fetch with recurseSubmodules = on-demand,
which I found the most convenient setting. However then I noticed that
I mostly use git pull actually to fetch from remotes, but git pull
does not utilize any recurseSubmoddules setting now, or at least I
could not find
Commit [1] added the --exclude option to revision.c. The --all,
--branches, --tags, --remotes, and --glob options clear the exclude
list. Shortly therafter, commit [2] added the same to 'git rev-parse',
but without clearing the exclude list for the --all option. Fix that.
[1] e7b432c52
From: Ben Peart
Updated the wording in the documentation and commit messages to (hopefully)
make it clearer. Added the warning about 'reset --quiet' to the advice
system so that it can be turned off.
Base Ref:
Web-Diff: https://github.com/benpeart/git/commit/8a2fef45d4
Checkout: git fetch
On Wed, Oct 17, 2018 at 3:58 PM Jonathan Tan wrote:
>
> > 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 workt
Do not suggest that --exclude-promisor-objects is supported by git-log,
since it currently BUG-crashes and it's not necessary to support it.
Options that control behavior for promisor objects should be limited to
a small number of commands.
Signed-off-by: Matthew DeVore
---
Documentation/rev
?
> >
> > I think we have some existing logic to prevent "git add"-ing a file
> > within a submodule to the superproject, for example.
>
> There is die_path_inside_submodule() that sanity-checks the pathspec
> and rejects. But I think that is done primarily to gi
On Mon, Oct 22, 2018 at 4:46 PM Andreas Heiduk wrote:
> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
> @@ -270,8 +270,8 @@ Porcelain Format
> The porcelain format has a line per attribute. Attributes are listed with a
> label and value separated
Remove the parapgraph numbers from lines explaining the reflog format
and typeset these lines in monospace.
Signed-off-by: Andreas Heiduk
---
Documentation/git-update-ref.txt | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-update-ref.txt b
The '--format=' is now listed in the 'OPTIONS' section, not only
the '' string itself. The description moved up a few paragraphs
because '' is not a standalone paramater but a parameter for the
option '--format'.
Signed-off-by: Andreas Heiduk
---
Documentation/git-tag.txt | 12 ++--
1
Defined delimiters for 'git worktree list --porcelain' make the format
easier to parse in scripts. For example
sed -n '/^worktree ID$/,/^$/p'
extracts only the information for the worktree 'ID'.
The format did not changed since [1], only the guaranty is added.
[1] bb9c03b82a (worktree
From: Ben Peart
Reworded the documentation for git-reset per review feedback.
Base Ref:
Web-Diff: https://github.com/benpeart/git/commit/1228898917
Checkout: git fetch https://github.com/benpeart/git reset-refresh-index-v3 &&
git checkout 1228898917
### Interdiff (v2..v3):
di
"git remote show " shows wrong information
about not yet configured for 'git push' local ref.
steps to reproduce:
$ git init
$ git remote add origin https://github.com/git/git # for example
$ git pull origin master
$ git remote show origin
...
Local ref configured for 'git push':
Hi Luca,
I re-Cc:ed the Git mailing list (it is in general a very good idea to keep
it in Cc:, as I could be hit by a bus, for example).
On Fri, 19 Oct 2018, Luca Weiss wrote:
> On Freitag, 19. Oktober 2018 17:30:17 CEST you wrote:
>
> > On Thu, 18 Oct 2018, Luca Weiss wrote:
>
Hi,
A draft of a new Git Rev News edition is available here:
https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-44.md
Everyone is welcome to contribute in any section either by editing the
above page on GitHub and sending a pull request, or by commenting on
this GitHub
Hi all,
I have been repeatedly bitten by the default behavior of `git stash` to stash
not just the unstaged but also the staged changes, and then `git stash pop`
making all changes unstaged. This means `git stash && git stash pop`, per
default, loses information, and when I just spe
I agree with you; dropped
this change.
- Definition of MIN without matching MAX makes me worried about
longer-term maintainability. If we were to add MIN() we should
also add MAX() to match.
However, "git grep -e '#define MAX(' -e '#define MIN('" tells me
that we do not use these anywhere and Brian
this macro is commonly defined in system headers (usually )
but if it is not define it here so it can be used elsewhere
Signed-off-by: Carlo Marcelo Arenas Belón
---
git-compat-util.h | 5 +
sha256/block/sha256.c | 3 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git
t make sense (i.e. ditto---and there is no good explanation
as to why entries appear at stage #1, other than the
real reason: this is only to be able to enumerate all paths that
are in and the index, so that error-unmatch can say
"Ah, that path is in the HEAD so it is not a ty
Jonathan Nieder writes:
> Stefan Beller wrote:
>
>> Maybe for now we can do with just an update of the documentation/bugs
>> section and say we cannot move files in and out of submodules?
>
> I think we have some existing logic to prevent "git add&quo
Matthew DeVore writes:
>> It is more like "this is a set operation across commits. We also
>> show objects that are reachable from the commits in the resulting
>> set and are not reachable from the commits in the set that were
>> excluded when --objects option is given".
>>
> That would be
On Thu, Oct 18, 2018 at 03:12:09PM -0500, Mahmoud Al-Qudsi wrote:
> Hello again all,
>
> I think I've previously broached this subject before, but I think I perhaps
> wasn't clear enough about what I was trying to do or why I feel that git is at
> fault here.
>
> (I
options and paths parameters can be used
> > to further limit the result.
>
> I am not sure if this is a good rewrite. It gives a false
> impression as if you'd not see anything if I did this:
>
> git rev-list --objects ^master md/filter-trees:t/valgrind
>
Oh that
Stefan Beller wrote:
> Maybe for now we can do with just an update of the documentation/bugs
> section and say we cannot move files in and out of submodules?
I think we have some existing logic to prevent "git add"-ing a file
within a submodule to the superproject, for exam
On Fri, Oct 19, 2018 at 5:43 AM Juergen Vogl wrote:
>
> Hi there,
>
> tested on both, git 2.18 and git 2.19.1:
>
> moving a file with `git mv` from a project to a submodule results in an
> **undefined state** of the local repository.
Luckily we do have a submodule in git.
not make any sense.
This seems to say that it only affects it when --error-unmatch is used,
but in fact it goes deeper; for example I can use it to list files that
are present in either the current work tree or some other branch:
joey@darkstar:/tmp/v> git checkout foo
joey@darkstar:/tmp/v> git ls
From: Ben Peart
This itteration avoids the refresh_index() call completely if 'quiet'.
The advantage of this is that "git refresh" without any pathspec is also
significantly sped up.
Also added a notification if finding unstaged changes after reset takes
longer than 2 seconds to
available in `next`, and
it is available in Git for Windows as an experimental feature.
Ciao,
Johannes
pens both with
> > 2.18.0 and 2.19.1 git versions. Having repository locally is not
> > required but reduces test runtime, you can quite reliably reproduce
> > issue when fetching over net directly from chromium.orgbypassing
> > mirroring step.
>
> Do you have the reproductio
Hi there,
tested on both, git 2.18 and git 2.19.1:
moving a file with `git mv` from a project to a submodule results in an
**undefined state** of the local repository.
It breaks up the submodule (it's still in .gitmodules, but not
accessable via `git submodule`), and is not reversible on local
Hello again all,
I think I've previously broached this subject before, but I think I perhaps
wasn't clear enough about what I was trying to do or why I feel that git is at
fault here.
(I'm running git 2.19.1)
Starting with a fully-committed, not-dirty codebase, I open(ed) a poorly
formatted
See subject, would be quite useful to have this. ("Countermand commit.gpgSign
configuration variable that is set to force each and every commit to be
signed.")
Thanks, Luca
his may (or may not) be related to and be a different symptom of
the leftover p4d processes Luke mentioned. I couldn't reproduce any
of this on my machine so far.
> diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
> index c27599474c..f4f5d7d296 100644
> --- a/t/lib-git-p4.sh
> +++ b/t/lib-
> 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.
The commit message
> No changes are needed in mirrored repository. Crash happens both with
> 2.18.0 and 2.19.1 git versions. Having repository locally is not
> required but reduces test runtime, you can quite reliably reproduce
> issue when fetching over net directly from chromium.orgbypassing
> mirr
() for every file.
If the user passes the --quiet switch, reset doesn�t display the remaining
unstaged changes but it still does all the work to find them, it just
doesn�t print them out so passing "--quiet" doesn�t help performance.
This patch series will:
1) change the behavior of "gi
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 ignores
Fix small typo as in document is used not .
Signed-off-by: Saulius Gurklys
---
Documentation/git-show-branch.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-show-branch.txt
b/Documentation/git-show-branch.txt
index 262db049d..4a0137122 100644
On 2018-10-16 05:54 PM, brian m. carlson wrote:
[...]
>> It doesn't help with direct commits to master, since CI would be
>> detecting it after it was committed. And when that happens we all know
>> that already because 'git pull' fails.
>
> Typically projects that ha
pass, the code doesn't merge.
>
> This is an excellent idea wrt to PRs. Thank you, Brian! I will implement
> that.
>
> It doesn't help with direct commits to master, since CI would be
> detecting it after it was committed. And when that happens we all know
> that already bec
hat.
It doesn't help with direct commits to master, since CI would be
detecting it after it was committed. And when that happens we all know
that already because 'git pull' fails.
--
Stas Bekman <'>< <'><
http
has a stripped out notebook checked out, when another
> person commits un-stripped out notebook, it leads to: invalid `git
> status` reports, `git pull` breaks, `git stash` doesn't work, since it
> tries to stash using the filters, and `git pull' can never succeed
> because it thinks that it'
and they might
> edit stuff e.g. in the GitHub UI directly, or with some other git
> implementation.
In this particular case github won't be a problem, since for the problem
to appear it has to be executed on the user side. Editing directly in
github UI is not a problem.
Just to giv
On Tue, Oct 16 2018, Stas Bekman wrote:
> When a person has a stripped out notebook checked out, when another
> person commits un-stripped out notebook, it leads to: invalid `git
> status` reports, `git pull` breaks, `git stash` doesn't work, since it
> tries to stash using
Hi,
TL;DR
Our open source project dev team has a continuous problem with git
content filters, because developers don't always have them configured.
We need a way for git to support content filters w/o using user's
.gitconfig. Otherwise it leads to an inconsistent behavior and messed up
git
;
>
> And here.
>
> > 15: bd827be103 ! 15: 989db67e9a stash: convert create to builtin
> > @@ -119,7 +119,6 @@
> > +static int check_changes(struct pathspec ps, int include_untracked)
> > +{
> > + int result;
> >
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
be103 ! 15: 989db67e9a stash: convert create to builtin
> @@ -119,7 +119,6 @@
> +static int check_changes(struct pathspec ps, int include_untracked)
> +{
> +int result;
> -+int ret = 0;
I was curious about this change,
tests
> > > > with different options.
> > > >
> > >
> > > I'm finding that it's leaving p4d processes lying around.
> >
> > That's a bummer!
> >
> > > e.g.
> > >
> > > $ ./t9820-git-p4-editor-handling.sh
> > >
-running the tests
> > with different options.
> >
> > Signed-off-by: Johannes Schindelin
> > ---
> > diff --git a/t/t-basic.sh b/t/t-basic.sh
> > @@ -134,6 +134,7 @@ check_sub_test_lib_test_err () {
> > +cat >/dev/null <<\DDD
For consistency, add full stops in a few places and outdent a line by
one space.
Signed-off-by: Rasmus Villemoes
---
Documentation/git-send-email.txt | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
l replace. Thanks.
>
> Luke Diamand (3):
> git-p4: do not fail in verbose mode for missing 'fileSize' key
> git-p4: unshelve into refs/remotes/p4-unshelved, not
> refs/remotes/p4/unshelved
> git-p4: fully support unshelving changelists
>
> Documentation/g
Thomas Gummerer writes:
> 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_cr
nnes Schindelin
> ---
> diff --git a/t/t-basic.sh b/t/t-basic.sh
> @@ -134,6 +134,7 @@ check_sub_test_lib_test_err () {
> +cat >/dev/null <<\DDD
> test_expect_success 'pretend we have a fully passing test suite' "
> run_sub_test_lib_test full-pass '3 pass
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
t;
> > > This should be more reliable than the current method, and prepares the
> > > test suite for a consistent way to clean up before re-running the tests
> > > with different options.
> > >
> >
> > I'm finding that it's leaving p4d processes lying
On 10/15/2018 12:24 PM, Derrick Stolee wrote:
Uncovered code in 'jch' (22f2f0f) and not in 'next' (152ad8e)
-
prio-queue.c
2d181390f3 94) return queue->array[queue->nr - 1].data;
(I have a fix to cover this in my private branch for
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
ite for a consistent way to clean up before re-running the tests
> > with different options.
> >
>
> I'm finding that it's leaving p4d processes lying around.
That's a bummer!
> e.g.
>
> $ ./t9820-git-p4-editor-handling.sh
>
> $ ./t9820-git-p4-editor-handling.sh
>
' with the output from 'git diff A B' to
discover _new_ lines of code that are not covered.
Thanks for doing this. I do notice, though, that there are a few mentions
of BUG() lines, e.g.
0af129b2ed builtin/rebase--interactive2.c 267) BUG("invalid command '%d'",
command);
I do not thi
---
Documentation/git-p4.txt | 6 +++---
git-p4.py| 3 ++-
t/t9832-unshelve.sh | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 41780a5aa9..6c0017e36e 100644
--- a/Documentation/git-p4.txt
This is the same as my earlier patch other than fixing the
documentation to reflect the change to the destination branch,
as noticed by Junio.
Luke Diamand (3):
git-p4: do not fail in verbose mode for missing 'fileSize' key
git-p4: unshelve into refs/remotes/p4-unshelved, not
refs/remotes
The previous git-p4 unshelve support would check for changes
in Perforce to the files being unshelved since the original
shelve, and would complain if any were found.
This was to ensure that the user wouldn't end up with both the
shelved change delta, and some deltas from other changes
If deleting or moving a file, sometimes P4 doesn't report the file size.
The code handles this just fine but some logging crashes. Stop this
happening.
There was some earlier discussion on the list about this:
https://public-inbox.org/git/xmqq1sqpp1vv@gitster.mtv.corp.google.com/
Signed
ng confused if there are unshelved changes in
> > > there as well. This happens in the function p4BranchesInGit().
> > >
> > > Instead, put the unshelved changes into refs/remotes/p4-unshelved/.
> >
> > I am not a p4 user (and not a git-p4 user), so it is a bit hard
ns.
>
I'm finding that it's leaving p4d processes lying around.
e.g.
$ ./t9820-git-p4-editor-handling.sh
$ ./t9820-git-p4-editor-handling.sh
And also
$ ./t9800-git-p4-basic.sh
Ctrl-C
$ ./t9800-git-p4-basic.sh
$ ps | grep p4d
21392 pts/100:00:00 p4d <<<<<
Luke
501 - 600 of 30258 matches
Mail list logo
