What a great forum this is really impressed with all the information and
advise.
--
View this message in context:
http://git.661346.n2.nabble.com/Cheap-Kitchen-Units-UK-tp7613286.html
Sent from the git mailing list archive at Nabble.com.
--
To unsubscribe from this list: send the line "unsubsc
If git rebase --merge encountered a conflict, --skip would not work if the
next commit also conflicted. The msgnum file would never be updated with
the new patch number, so no patch would actually be skipped, resulting in an
inescapable loop.
Update the msgnum file's value as the first thing in c
On Fri, Jun 13, 2014 at 10:15:49AM -0400, Phillip Susi wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
> On 6/13/2014 3:34 AM, Jeff King wrote:
> > Thanks for saving the stuck state.
> >
> > If it's possible to share the whole repo, it might be worth seeing
> > (then we can all just ru
105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
on mkdtemp, which is not available on Windows.
Restore the original temporary directory behavior for Windows so
that gitk creates temporary directories in the current
repository.
The Unix code path retains new TMPDIR behavior.
Repo
On Sun, Jun 15, 2014 at 02:49:29PM -0700, David Aguilar wrote:
> I don't think this requires a CVE since it's basically plugging a hole
> that my previous patch introduced by making gitk honor the TMPDIR
> variable; it hasn't strictly been in any release yet.
Yeah, that's not needed, then. I didn
On Sun, Jun 15, 2014 at 04:32:27PM +, brian m. carlson wrote:
> On Sun, Jun 15, 2014 at 08:51:23AM +0100, Pat Thoyts wrote:
> > David Aguilar writes:
> > >--- a/gitk
> > >+++ b/gitk
> > >@@ -3502,7 +3502,8 @@ proc gitknewtmpdir {} {
> > > } else {
> > > set tmpdir $gitdir
> > > }
> >
> -Original Message-
> From: brian m. carlson [mailto:sand...@crustytoothpaste.net]
> Sent: Sunday, June 15, 2014 12:45
> To: git@vger.kernel.org; Jason Pyeron
> Subject: Re: [OT] List CC etiquette and my brain just do not
> seem to work
>
> On Sun, Jun 15, 2014 at 10:27:21AM -0400, Jaso
Test that the revert command updates the work tree as expected (for
submodule changes which don't result in conflicts). Add a helper function
to first revert the checked out target commit to make the last revert
produce the to-be-tested work tree.
Set the KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMI
Test that the stash apply command updates the work tree as expected for
changes which don't result in conflicts. To make that work add a helper
function that uses read-tree to apply the changes of the target commit
to the work tree, then stashes these changes and at last applies that
stash.
Implem
Test that the checkout command updates the work tree as expected with
and without the '-f' flag.
Signed-off-by: Jens Lehmann
---
t/t2013-checkout-submodule.sh | 5 +
1 file changed, 5 insertions(+)
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
index 06b18f8..684
Test that the am command updates the work tree as expected (for submodule
changes which don't result in conflicts). To make that work add two
helper functions that use format-patch to create the input for am.
Add the KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
switch to expe
Test that the cherry-pick command updates the work tree as expected (for
submodule changes which don't result in conflicts).
Set KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
and KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
document that cherry-pick has the sa
Test that the pull command updates the work tree as expected (for
submodule changes which don't result in conflicts) when used without
arguments or with the '--ff', '--ff-only' and '--no-ff' flag each. Add
helper functions to reset the branch to be updated to to the current
HEAD so that pull is doi
Test that the rebase command updates the work tree as expected for
changes which don't result in conflicts. To make that work add two
helper functions that add a commit only touching files and then
revert it. This allows to rebase the target commit over these two
and to compare the result.
Set KNO
Test that the merge command updates the work tree as expected (for
submodule changes which don't result in conflicts) when used without
arguments or with the '--ff', '--ff-only' and '--no-ff' flag.
Implement the KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR
switch to expect the known
Test that the reset command updates the work tree as expected for changes
with '--keep', '--merge' (for changes which don't result in conflicts) and
'--hard'.
Signed-off-by: Jens Lehmann
---
t/t7112-reset-submodule.sh | 14 ++
1 file changed, 14 insertions(+)
create mode 100755 t/t7
Test that the bisect command updates the work tree as expected. To make
that work with the new submodule test framework a git_bisect helper
function is added. This adds a commit after the one given to be switched
to and makes that one the bad commit. The starting point is then given to
bisect as th
Test that the read-tree command updates the work tree as expected for
changes which don't result in conflicts with the '-m' and '--reset' flag.
Signed-off-by: Jens Lehmann
---
t/t1013-read-tree-submodule.sh | 12
1 file changed, 12 insertions(+)
create mode 100755 t/t1013-read-tree
Test that the apply command updates the work tree as expected for the
'--index' and the '--3way' options (for submodule changes which don't
result in conflicts).
Signed-off-by: Jens Lehmann
---
t/t4137-apply-submodule.sh | 20
1 file changed, 20 insertions(+)
create mode 10
Add this test library to simplify covering all combinations of submodule
update scenarios without having to add those to a test of each work tree
manipulating command over and over again.
The functions test_submodule_switch() and test_submodule_forced_switch()
are intended to be called from a test
For the upcoming submodule test framework we often need to assert that an
empty directory exists in the work tree. Add the test_dir_is_empty()
function which asserts that the given argument is an empty directory.
Signed-off-by: Jens Lehmann
---
t/test-lib-functions.sh | 11 +++
1 file ch
This is the series I sought feedback for some time ago in gmane/$245048. It
took longer than I expected to finish this series because I had to diagnose
the test failures I saw with some of the ten commands I added since then.
They boiled down to four different inconsistencies in Git's handling of n
On Sun, Jun 15, 2014 at 10:27:21AM -0400, Jason Pyeron wrote:
>
> Why can the list set the reply to the list and if there is a sender
> whos email is not on the list add them to the reply to header as well.
https://www.google.com/search?q=reply+to+considered+harmful
> I forget too many times to
On Sun, Jun 15, 2014 at 08:51:23AM +0100, Pat Thoyts wrote:
> David Aguilar writes:
> >--- a/gitk
> >+++ b/gitk
> >@@ -3502,7 +3502,8 @@ proc gitknewtmpdir {} {
> > } else {
> > set tmpdir $gitdir
> > }
> >-set gitktmpdir [file join $tmpdir [format ".gitk-tmp.%s" [pid]]]
> >+
> -Original Message-
> From: Jeff King
> Sent: Sunday, June 15, 2014 10:08
>
> On Sun, Jun 15, 2014 at 09:48:24AM -0400, Jason Pyeron wrote:
>
> > Whenever my computer crashes, I am left with a socket file.
> On next git
> > invocation it tries to conenct to the file, but the daemon
>
Why can the list set the reply to the list and if there is a sender whos email
is not on the list add them to the reply to header as well.
I forget too many times to fix the address lines, and I get beaten with a stick
at work when I use the reply all.
--
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
> -Original Message-
> From: Jeff King
> Sent: Sunday, June 15, 2014 10:08
>
> On Sun, Jun 15, 2014 at 09:48:24AM -0400, Jason Pyeron wrote:
>
> > Whenever my computer crashes, I am left with a socket file.
> On next git
> > invocation it tries to conenct to the file, but the daemon
>
On Sun, Jun 15, 2014 at 09:48:24AM -0400, Jason Pyeron wrote:
> Whenever my computer crashes, I am left with a socket file. On next git
> invocation it tries to conenct to the file, but the daemon is not running so
> it
> barfs until I delete the file.
It's supposed to transparently handle this
Whenever my computer crashes, I am left with a socket file. On next git
invocation it tries to conenct to the file, but the daemon is not running so it
barfs until I delete the file.
jpyeron@black /projects/dcarr/saar
$ git push
fatal: unable to connect to cache daemon: No error
Username for x
On Fri, Jun 13, 2014 at 10:32:09AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > On Thu, Jun 12, 2014 at 12:07:03PM -0700, Junio C Hamano wrote:
> >> "Michael S. Tsirkin" writes:
> >> ...
> >> > 1. new parameter am.signoff can be used any number
> >> > of times:
> >> >
> >>
Could you change the author to "Yi EungJun "
if you apply this patch?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Could you change the author to "Yi EungJun "
if you apply this patch?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Aguilar writes:
>gitk uses a predictable ".gitk-tmp.$PID" pattern when generating
>a temporary directory.
>
>Use "mktemp -d .gitk-tmp.XX" to harden gitk against someone
>seeding /tmp with files matching the pid pattern.
>
>Signed-off-by: David Aguilar
>---
>This issue was brought up du
On Fri, 2014-06-13 at 12:05 -0700, Ronnie Sahlberg wrote:
> Thinking about it more.
>
> I think we want to wait until the ref transaction API work is
> finished. The ref transactions API is in progress and it aims to add
> transactions for ref updates as a first step but then it aims to
> define a
34 matches
Mail list logo
