rev-parse --is-bare-repository incorrectly outputs "false" when testing
a bare repository with the work tree set.
To reproduce:
$ git init --bare testbare
$ git --git-dir=testbare rev-parse --is-bare-repository
true
$ git --git-dir=testbare --work-tree=something rev-parse \
--is-bare-repository
Given:
A-B-C-D-E (HEAD)
I want to create a single commit that reverts A-B-C
So, I execute:
git revert --no-commit A~..C
which causes conflict (while reverting C, it seems).
I resolve conflicts and I continue:
git revert --continue --no-commit
And, it complains:
fatal: revert: --no
> On Sep 28, 2018, at 11:00 AM, Junio C Hamano wrote:
>
> Sam McKelvie writes:
>
>>> Ah, that, too. I meant to correct triple ell, though ;-)
>>> ...
>>
>> I wholeheartedly approve of that plan and your tweaking commit below. Thank
>> you,
> On Sep 27, 2018, at 6:43 PM, Junio C Hamano wrote:
>
> Sam McKelvie writes:
>
>>>> Subject: Re: [PATCH] submodule: Alllow staged changes for
>>>> get_superproject_working_tree
>>>
>>> s/Alllow/allow/;
>>>
>>
>&
All of your comments seem reasonable; however, since the patch was signed off
by Stefan it
Is unclear to me whether I should submit another patch or what. I apologize for
not being
facile with the patching workflow.
> On Sep 27, 2018, at 3:02 PM, Junio C Hamano wrote:
>
> Sam McKelvi
; this patch makes it use the first entry if multiple entries
are returned.
Test t1500-rev-parse is extended to cover this case.
Signed-off-by: Sam McKelvie
---
submodule.c | 2 +-
t/t1500-rev-parse.sh | 17 -
2 files changed, 17 insertions(+), 2 deletions(-)
diff --gi
hild-test
16 e6178f3a58b958543952e12824aa2106d560f21d 3 submodule-child-test
The code in get_superproject_working_tree() expected exactly one entry to
be returned;
this patch makes it use the first entry if multiple entries are returned.
Signed-off-by: Sam McKelvie
---
submod
here because strbuf_read ensures the result
buffer is null-terminated.
Thanks,
Sam McKelvie
On 12 Oct 2017 at 11:48 Thomas Braun wrote:
> On 9 Oct 2017 at 23:59, Stefan Beller wrote:
>> On 9 Oct 2017 at 14:29, Thomas Braun wrote:
>>> I'm currently in the progress of pulling some subprojects in a git
>>> repository of mine into their
>>> own repositories and adding these subprojects back
On 12/06/2018, Junio C Hamano wrote:
> Sam Kuper writes:
>> [...] It makes sense that `git am [--skip|--abort]` and `git rebase
>> [--skip|--abort]` would run `git rerere clear`.
>>
>> However, if they run it, then shouldn't `git merge --abort` run it, too?
>&
`man git-rerere` says:
> clear
>
> Reset the metadata used by rerere if a merge resolution is to be
> aborted. Calling git am [--skip|--abort] or git rebase
> [--skip|--abort] will automatically invoke this command.
It makes sense that `git am [--skip|--abort]` and `git rebase
[--skip|--abort]` w
On 02/03/2018, Junio C Hamano wrote:
> Jeff King writes:
>> Unfortunately, I don't think there's an easy way to do what you want
>> (show word-diffs but apply the full diff).
>
> The current "word-diff" discards the information on where the lines
> end, and it is pretty much hopeless/useless in t
On 02/03/2018, Jeff King wrote:
> Unfortunately, I don't think there's an easy way to do what you want
> (show word-diffs but apply the full diff).
Oh :(
That would be a *very* useful feature to have, especially where
multiple small (e.g. single character or single word) changes are
sprinkled th
On 02/03/2018, Jonathan Nieder wrote:
> Is this reproducible for you?
Yes. It seems to occur consistently, given the same input.
> Do you have more details about how I can reproduce it?
Unfortunately, the particular git repo I encountered it on is private,
otherwise I would point you to it.
I
First, background. I encountered a bug on Debian Stretch, using this
git version:
$ git --version
git version 2.11.0
The bug is that in the midst of running
git -c interactive.diffFilter="git diff --word-diff --color" add --patch
and after having answered "y" to some patches and "n" to others,
Good day,
I am Mr. Sam Azada from Burkina Faso a Minister confide on me to look
for foreign partner who will assist him to invest the sum of Fifty
Million Dollars ($50,000,000) in your country.
He has investment interest in mining, exotic properties for commercial
resident, development
Aha, thanks, I'll go annoy them :P
On 10 January 2018 at 16:29, Randall S. Becker wrote:
> OpenSSH generally. Other providers (and platform providers) exist as well. It
> is hard to know which is really involved, but not git.
>
>> -Original Message-
>> From: Sa
ter belongs there
> and you're likely to get more detailed information from that team.
> Sincerely,
> Randall
>
>> -Original Message-
>> From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On
>> Behalf Of Sam Millman
>> Sent: January 10,
actually work, it seems it is the
Host * that make sit work and it will actually iterate the keys and
try them.
Not sure why this is, any thoughts?
On 10 January 2018 at 15:58, Ævar Arnfjörð Bjarmason wrote:
>
> On Wed, Jan 10 2018, Sam Millman jotted:
>
>> I am trying, for the s
That would mean I would need to change the case for a letter everytime
I have a repo with a new key, that would mean I would be restricted to
12 client repos at a time :\, seems very hacky to me
On 10 January 2018 at 15:58, Randall S. Becker wrote:
> On January 10, 2018 10:31 AM Sam Mill
result.
The weird thing is, I have two public keys as well and they both load
in the ssh . exe (they return errors about format), I just cannot get
my ssh . exe to work with multiple private keys.
On 10 January 2018 at 15:29, Sam Millman wrote:
> I am trying, for the sake of PhpStorm, to get multi
Good day,
I am Mr. Sam Azada from Burkina Faso a Minister confide on me to look
for foreign partner who will assist him to invest the sum of Fifty
Million Dollars ($50,000,000) in your country.
He has investment interest in mining, exotic properties for commercial
resident, development
Good day,
I am Mr. Sam Azada from Burkina Faso a Minister confide on me to look
for foreign partner who will assist him to invest the sum of Fifty
Million Dollars ($50,000,000) in your country.
He has investment interest in mining, exotic properties for commercial
resident, development
Good day,
I am Mr. Sam Azada from Burkina Faso a Minister confide on me to look
for foreign partner who will assist him to invest the sum of Fifty
Million Dollars ($50,000,000) in your country.
He has investment interest in mining, exotic properties for commercial
resident, development
Good day,
I am Mr. Sam Azada from Burkina Faso a Minister confide on me to look
for foreign partner who will assist him to invest the sum of Fifty
Million Dollars ($50,000,000) in your country.
He has investment interest in mining, exotic properties for commercial
resident, development
Good day,
I am Mr. Sam Azada from Burkina Faso a Minister confide on me to look
for foreign partner who will assist him to invest the sum of Fifty
Million Dollars ($50,000,000) in your country.
He has investment interest in mining, exotic properties for commercial
resident, development
On Tue, Sep 12, 2017 at 10:33:37AM -0700, Stefan Beller wrote:
> On Sun, Sep 10, 2017 at 9:27 PM, Sam Bobroff wrote:
>
> > (If only there were a way to set the coverletter text automatically as
> > well...)
> >
>
> Checkout branch..description
AH! I had seen th
On Wed, Sep 06, 2017 at 12:34:48PM +0900, Junio C Hamano wrote:
> Sam Bobroff writes:
>
> > If "--notes=..." is used with "git format-patch", the notes are
> > prefixed with the ref's local name and indented, which looks odd and
> > exposes
cluded without additional
processing.
Signed-off-by: Sam Bobroff
---
Notes (foo):
Hi,
I've noticed what appears to be a small cosmetic bug in git format-patch, as
I've described in the commit message.
I'm not sure if this patch is the right way to fix it (o
Hello Kevin,
Yes, you're right - I didn't commit the change to the .gitignore file,
so that addition is also being stashed.
Thanks
Sam
Sam Partington
Senior Developer
www.whiteoctober.co.uk
Office: +44 (0)1865 920 707
This email message and any attachments are confidential and sole
bin/mynewfile
This is quite an unusual edge case, but I have hit it two or three
times now and so thought it worth reporting, but I'll understand if
it's deemed not worth fixing!
Do let me know if you need any more information from me here.
Thanks
Sam
PS Sorry for the lack of formatti
ur could
remain the same, unless it was actually a bug.
--
Sam.
On Tue, Dec 15, 2015, James Farwell wrote:
> I'm not sure if my opinion as an outsider is of use, but since the perforce
> change number is monotonically increasing, my expectation as a user would be
> for them
is under
//depot/ so in order to write a test for this situation there are a few
things to change in lib-git-p4.sh.
Regards,
--
Sam.
--
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
e I dig into the task.
Regards,
--
Sam.
--
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
When submitting from a repository that was cloned using a client spec,
use the full list of paths when ruling out files that are outside the
view. This fixes a bug where only files pertaining to the first path
would be included in the p4 submit.
Signed-off-by: Sam Hocevar
---
git-p4.py | 11
: Sam Hocevar
---
git-p4.py | 43 ---
1 file changed, 20 insertions(+), 23 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 210f100..ea2bbb2 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -796,39 +796,36 @@ def p4ChangesForPaths(depotPaths, changeRange
STEPS TO REPRODUCE:
1. git checkout master
2. git rebase --quiet master topic
EXPECTED RESULTS:
The checkout and rebase occur with no output.
ACTUAL RESULTS:
The output from the checkout is not suppressed.
Thanks,
Sam
--
To unsubscribe from this list: send the line "unsubscribe git" i
might also like to check out my git-p4raw project which imports
directly from the raw repository files into a git repo using git fast-import
http://github.com/samv/git-p4raw
Apparently it's my most popular github project :-). YMMV.
Sam.
--
To unsubscribe from this list: send the line &q
When using the git-p4.py script, I found that if I used a client spec when
cloning out a perforce repository, and then using a git-p4.py rebase, that
the rebase command would be using the current perforce client spec,
instead of the one used when doing the initial clone. My proposed patch
causes th
t nicely generic, to be well prepared
for when a second pre-image attack on SHA-1 becomes practical.
Sam
--
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
hough tricky) to do it lazily,
where a tree entry has bits (eg, some of the currently unused file mode
bits) to denotes which hash algorithm is in use for the entry. However
I don't think that got past idea stage...
Sam
--
To unsubscribe from this list: send the line "unsubscribe g
ior to 1.5, the Perl community developed SVK, an offline version of
SVN, and this had a far simpler model for merge tracking, more similar
to git's: just tracking whole-branch merges rather than individual
files, patches, and branches. SVN eventually added two separate ways of
tracking merges: eit
stributed consistent with
this project or the open source license(s) involved.
Signed-off-by: Sam McLeod
git-push-stderr.patch
Description: Binary data
there's a good chance you won't need to clone
everything forever; as shards with not many files for the current
version could in theory be retired. Or, if the directory structure
already suits it, you could "directly" use submodules.
The second challenge will be writing the f
27;¥0';
This seems to be an encoding mistake; was this supposed to be an ASCII
arrow?
Sam
--
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
--
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
I would use the config feature to turn on --prune for fetch, and was
surprised that it wasn't available - I hit this thread because I figured I
somehow missed it in the config docs.
Having both global and local settings seems nice.
--
View this message in context:
http://git.661346.n2.nabble.c
Hmmm nabble embed didn't provide much value there :)
http://pastebin.com/RC8mUPF3
--
View this message in context:
http://git.661346.n2.nabble.com/Segmentation-fault-with-latest-git-070c57df-tp7576614p7585907.html
Sent from the git mailing list archive at Nabble.com.
--
To unsubscribe from thi
Hi,
Has there been any further progress on this. I just encountered a SEGV with
a git apply. This is the latest git version running on Ubuntu 13.04
cat /etc/lsb-release
DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=13.04
DISTRIB_CODENAME=raring
DISTRIB_DESCRIPTION="Ubuntu 13.04"
uname -a
Lin
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
On 08/18/2012 01:43 PM, Steven Walter wrote:
> How about a Signed-Off-By?
Signed-Off-By: Sam Vilain
Sam
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQEcBAEBCgAGBQJQMCcnAAoJEBdtaL3wGtIoJ1UIAIJ6Xz5OEMmMk1tq546eggHg
I+sJIF
vn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1
&&
+ svn_cmd switch "$svnrepo"/branches/branch1 &&
You refer to these as "branchA" and "branchB" in your commit message.
It would be easier to follow
;
$found++;
- last;
}
I could believe that, too. I like this change: one line of code, 53
lines of test and a paragraph of explanation :-).
Cheers,
Sam.
--
To unsubscribe from this list: send the line "unsubscribe gi
On Sat, Sep 03, 2005 at 12:32:03PM -0700, Junio C Hamano wrote:
> Sam Ravnborg <[EMAIL PROTECTED]> writes:
>
> > As explained in another mail what we want to do is actually to
> > transpose the changes made to F to the now renamed file G.
> > So we end up with G con
with G containing the modifications made to F.
Also we want to include the new file K.
So we end up with a new commit containing the renamed file with
modifications and the new files too.
I hope this simplfies the usecase from a git perspective.
Sam
-
To unsubscribe from this list: se
e I were modifying the build system the development continued and a
few files saw some updates in the official klibc tree.
So what we want to do in this case is:
- Merge the kbuild changes into the official tree without loosing the
changes made to renamed files.
On purpose I did not modify any of the re
to specify the topmost SHA1 (or
HEAD:5 or HEAD^) from where the reset should start.
Sam
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
rything.
After a git-reset HEAD^ I really expect git to have rewinded back till
where I started with no files added whatsoever.
>From the matter of least suprise git should not remember files added,
one have to do that by themself again if needed.
Sam
-
To unsubscribe from this list: sen
f that makes a difference.
The only git- command I use today is git-applymbox.
Sam
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Aug 11, 2005 at 10:24:10PM +0200, Matthias Urlichs wrote:
> Hi,
>
> Sam Ravnborg:
> > >
> > > Anyway, enough of this. I understand the name will not change and I'm
> > > ok with that. I'll deal with it on our (Debian's) end.
> >
>
> Anyway, enough of this. I understand the name will not change and I'm
> ok with that. I'll deal with it on our (Debian's) end.
The easy fix is to kill the small git script that is not
mandatory anyway (as far as my quick grep told me).
The cg script has a bit more
o?
I recall having trouble locating them myself when I first tried Greg's
send-a-lot-of-mails script.
Sam
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Hubert.
git@vger.kernel.org is a better place to request this.
So I have included them in to:
Sam
On Wed, Aug 10, 2005 at 03:59:02PM +, Hubert Tonneau wrote:
> The 'V' column on http://www.kernel.org/ is very convienient to review what
> has changed in a n
> Sam,
> try it! :)
Works excellent - and less than 12 hours after I posted my feautre
reqest. That was quick!
Thanks,
Sam
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http:/
> You have Firefox, don't you? Next time you surf to gitweb, right click on
> the funny yellow symbol in the lower right corner of your Firefox. It
> should say something like "Subscribe to...". Do it.
Unfortunately not on my firefox. 1.0.6 on gentoo.
Puzzled...
On Tue, Aug 09, 2005 at 09:58:18PM +0200, Kay Sievers wrote:
> On Tue, Aug 09, 2005 at 09:31:04PM +0200, Sam Ravnborg wrote:
> > Hi Kay.
> >
> > When browsing http://www.kernel.org/git I often find myself looking for
> > the most recently changed tree.
> > For t
the output
according to last change, owner and description.
Using a click-able table heading would be the most intuitive way.
I have not looked into the source for gitweb, so I really do not know
how difficult this would be.
Sam
-
To unsubscribe from this list: send the line "unsu
dropping a commit has proved
useful for me from time to time, so I expect it be be implemented in the
porcelain somehow.
I have read the help for cg-seek - but it di not convince me to be what
I seeked.
Sam
-
To unsubscribe from this list: send the line "unsubscribe git" in
the
SCM uses the
timestamp of the chekin.
There has been put a tremendous effort in tracking each and every subtle
dependeny - and if something is missing then it ought to be fixed.
Sam
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL
he old days.
Sam
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
to use one of the porcelains in these examples, maybe accompanied by the
raw git commands being executed.
Sam
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
ld be relative straightforward to include in git.
> I think I'm going to rethink this, a bit more. I'm unhappy with how I
> had to edit the sub-dir Makefiles to include directory names. Sam, if
> you happen to be reading this, feel free to help out!
>
> I&
y the include/linux/stingify.h file from the kernel also.
That makes it available for other users also.
Sam
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
ve different templates for vim, emacs, kade etc.
Sam
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jul 06, 2005 at 12:42:20AM +0200, Sam Ravnborg wrote:
> >
> > I receive the following error:
> > git-update-cache: symbol lookup error: git-update-cache: undefined
> > symbol: deflateBound
> >
>
> > open("/usr/lib/libz.so.1", O_R
s linked
dynamically towards an older libz.so version.
Latest installed is libz.1.2.2 which includes deflateBound.
libz.so.1 points at 1.1.4 which does not.
Sam
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More maj
.
To my best knowledge I have a working zlib installed.
Any help really appreciated!
Sam
strace appended:
[EMAIL PROTECTED] ~/linux/net-kconfig $ strace git-update-cache --
drivers/Kconfig drivers/net/Kconfig net/Kconfig > ../z
execve("/home/sam/bin/git-update-cache
76 matches
Mail list logo
