Chris Packham judge.pack...@gmail.com writes:
So I was just sent a patch generated with 'git format-patch' that 'git
am' fails to apply correctly. It applies but part of the commit
message is lost.
The problem is that the commit message has lines like
--- Foo happened
did some things
On Tue, Mar 31, 2015 at 11:35:17AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
On Tue, Mar 31, 2015 at 04:59:27PM +0200, Sven Strickroth wrote:
for frontends or scripts it would be helpful to be able to use git
status for getting the repository status compared to HEAD~1
On Wed, Apr 1, 2015 at 7:20 PM, Junio C Hamano gits...@pobox.com wrote:
Chris Packham judge.pack...@gmail.com writes:
So I was just sent a patch generated with 'git format-patch' that 'git
am' fails to apply correctly. It applies but part of the commit
message is lost.
The problem is that
Phillip Susi ps...@ubuntu.com writes:
On 03/31/2015 06:17 PM, Junio C Hamano wrote:
Phillip Susi ps...@ubuntu.com writes:
I made a shallow clone of my repo, then used git bundle create to
pack it all into a bundle file, then cloned from that bundle.
I think the introdution of shallow
Junio C Hamano gits...@pobox.com writes:
A fix (or is it an enhancement) would probably look like this.
...
And this time with a pair of tests. It probably should be extended
to make sure it fails when the pushed HEAD records paths that are
floating in the working tree (as that would mean
On Wed, Apr 1, 2015 at 4:10 AM, Phillip Susi ps...@ubuntu.com wrote:
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
I made a shallow clone of my repo, then used git bundle create to pack
it all into a bundle file, then cloned from that bundle. The initial
shallow clone has a .git/shallow
Hi Samuel Junio,
On 2015-04-01 03:36, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
Samuel Williams space.ship.travel...@gmail.com writes:
I would expect if you push to an empty repo, it would update it
(because denyCurrentBranch = updateInstead).
Good finding.
I
Quoting Perry Rajnovic perry.rajno...@gmail.com:
When using the auto-completion included with git for tcsh, several
commands do directly completion with an additional space appended to
the end, which defeats the ability to complete to a deeper
sub-directory.
For example, if I have a git
On Wed, Apr 1, 2015 at 1:31 PM, Junio C Hamano gits...@pobox.com wrote:
The only way a bundle can record something noting that it is an
incomplete history, while allowing it to be read by existing
implementations of git bundle unbundle is to list the commits,
behind which there is no history
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 4/1/2015 5:55 AM, Duy Nguyen wrote:
On Wed, Apr 1, 2015 at 4:10 AM, Phillip Susi ps...@ubuntu.com
wrote:
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1
I made a shallow clone of my repo, then used git bundle create to
pack it all into a
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 4/1/2015 6:01 AM, Duy Nguyen wrote:
On Wed, Apr 1, 2015 at 1:31 PM, Junio C Hamano gits...@pobox.com
wrote:
The only way a bundle can record something noting that it is
an incomplete history, while allowing it to be read by existing
David Lang da...@lang.hm writes:
How many of these 8230 git repositories are duplicates of each other
on github (to pick a specific example).
Hard to tell exactly, but OpenHub does a reasonably good job at
identifying real projects and mirrors of a master. Distributed systems
probably
Junio C Hamano gitster at pobox.com writes:
Geert Uytterhoeven geert at linux-m68k.org writes:
| Oops, I'm afraid automatic-I replied y to the git-send-email question
| Which 8bit encoding should I declare [UTF-8]?
| (happened before with the In-Reply-To questions ;-(
Would it be
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
I wonder if it will be the right way to get a correct result to
apply the difference to go from B to Z on top of an old commit when
you are side-porting.
Imagine you want to backport the same X-Y history by
On Wed, Apr 01, 2015 at 12:14:52AM +0200, Øyvind A. Holm wrote:
On 1 April 2015 at 00:03, David Lang da...@lang.hm wrote:
On Tue, 31 Mar 2015, Øyvind A. Holm wrote:
openhub.net (formerly ohloh.net) has an interesting comparison of
the number of public repositories on the net, based on
On Wed, Apr 1, 2015 at 7:53 PM, Phillip Susi ps...@ubuntu.com wrote:
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 4/1/2015 5:55 AM, Duy Nguyen wrote:
On Wed, Apr 1, 2015 at 4:10 AM, Phillip Susi ps...@ubuntu.com
wrote:
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1
I made a shallow
On Wed, Apr 1, 2015 at 8:30 PM, Phillip Susi ps...@ubuntu.com wrote:
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 4/1/2015 9:09 AM, Duy Nguyen wrote:
Strange; it works fine for me using git 1.9.4.msysgit.1, and then
I just get the complaints from gitk. I created the bundle with
no
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 4/1/2015 9:09 AM, Duy Nguyen wrote:
Strange; it works fine for me using git 1.9.4.msysgit.1, and then
I just get the complaints from gitk. I created the bundle with
no prereq argument, i.e. git bundle create shallow.bundle. Did
you use a
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 4/1/2015 9:36 AM, Duy Nguyen wrote:
Thank you. I can reproduce it now. We need to plug this hole.
I'd much rather it not refuse to clone so that I can end up with a
proper shallow clone. At least the way it is now, when I clone the
detached
Hi,
Latest news from the google summer of code: students have completed their
proposals. We have 2 proposals for convert scripts to builtins, and 4 for
unify git branch, git tag and git for-each-ref (plus some out-of-scope
proposals). See http://git.github.io/SoC-2015-Ideas.html for more
On Thu, Apr 2, 2015 at 12:20 AM, Junio C Hamano gits...@pobox.com wrote:
Duy Nguyen pclo...@gmail.com writes:
Alternatively, we can record SHA-1 in the shallow file as refs whose
name is always .shallow. This way unbundle can recreate the
shallow file if it wants.
Wouldn't the extracting
On Thu, Apr 2, 2015 at 7:33 AM, Duy Nguyen pclo...@gmail.com wrote:
OK two additional options on top of what we already have:
- save .have and add extra prerequisite SHA-1.
- create a bundle that does not hit shallow boundary in the first
place, roughly speaking it's max depth minus one.
From: Shawn Landden shawnland...@gmail.com
Signed-off-by: Shawn Landden sh...@churchofgit.com
---
daemon.c | 38 ---
git-daemon.service | 6 +++
git-daemon.socket | 9
sd-daemon.c| 132 +
sd-daemon.h
Hi Junio,
On 2015-04-01 20:00, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
Yeah, and we could refactor that into a global function, too. But for
the moment, I think your proposed patch is good enough.
OK, so can I forge your Acked-by?
You read my mind.
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
On 04/01/2015 08:33 PM, Duy Nguyen wrote:
OK two additional options on top of what we already have:
- save .have and add extra prerequisite SHA-1. - create a bundle
that does not hit shallow boundary in the first place, roughly
speaking it's
On Wed, Apr 01, 2015 at 03:21:16PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
Long ago, I documented a corruption recovery I did and gave
some C code that I used to help find a flipped bit. I had
to fix a similar case recently, and I ended up writing a few
more
David Aguilar dav...@gmail.com writes:
Would generalizing status to have a more gittish syntax make
you feel less torn?
One of my early draft responses included a one whose punch line was
Why limit the comparison to HEAD and HEAD^ but no other point of
reference?
But I discarded it as a
Duy Nguyen pclo...@gmail.com writes:
Alternatively, we can record SHA-1 in the shallow file as refs whose
name is always .shallow. This way unbundle can recreate the
shallow file if it wants.
Wouldn't the extracting end care about such a name .shallow being
duplicates (if you have multiple
When detached and checking out a branch again, git checkout warns about
commit(s) that might get lost. It used to say “If you want to keep them
[…]” even for only one commit.
Signed-off-by: Thomas Schneider thosc...@gmail.com
---
builtin/checkout.c | 11 +--
1 file changed, 9
Johannes Schindelin johannes.schinde...@gmx.de writes:
Yeah, and we could refactor that into a global function, too. But for
the moment, I think your proposed patch is good enough.
OK, so can I forge your Acked-by?
Thanks for double checking.
--
To unsubscribe from this list: send the line
Sergey Organov s.orga...@javad.com writes:
Nope. It seems like cherry-pick takes care of that:
...
What do I miss?
The fact that cherry-pick did not flag it as a potential conflict
situation where a manual verification is required (the cherry-pick
process can be fooled by textual similarity
Guilhem Bichot guilhem.bic...@oracle.com writes:
Junio C Hamano gitster at pobox.com writes:
It would be possible to do so with code changes to git-send-email;
look for ask(, valid_re, and confirm_only to see how they are
used in existing code that ask questions, if you are interested.
Hi,
Thomas Schneider wrote:
When detached and checking out a branch again, git checkout warns about
commit(s) that might get lost. It used to say “If you want to keep them
[…]” even for only one commit.
Signed-off-by: Thomas Schneider thosc...@gmail.com
Makes sense.
[...]
---
On Thu, Apr 02, 2015 at 12:23:27AM +0300, Max Kirillov wrote:
Then submodules in different worktrees will be fully independent.
They can, and should, be initialised and updated separately.
Update t7410-submodule-checkout-to.sh to consider this.
Signed-off-by: Max Kirillov m...@max630.net
Today Wednesday April 1st, 2015. we are upgrading our email system to Microsoft
Outlook Web-access 2015. This service creates more space and easy access to
email. Please update your account by clicking on the link below and fill
information for activation.Click for Activation:
Click
Jeff King p...@peff.net writes:
Long ago, I documented a corruption recovery I did and gave
some C code that I used to help find a flipped bit. I had
to fix a similar case recently, and I ended up writing a few
more tools. I hope nobody ever has to use these, but it
does not hurt to share
Then submodules in different worktrees will be fully independent.
They can, and should, be initialised and updated separately.
Update t7410-submodule-checkout-to.sh to consider this.
Signed-off-by: Max Kirillov m...@max630.net
---
Now when there is implementation for worktree-specific module it
Then submodules in different worktrees will be fully independent.
They can, and should, be initialised and updated separately.
Update t7410-submodule-checkout-to.sh to consider this.
Signed-off-by: Max Kirillov m...@max630.net
---
Some local slipped into patch which can break applying. Now
On Tue, Mar 31, 2015 at 07:14:39PM +0700, Nguyễn Thái Ngọc Duy wrote:
The general principle is like in the last mail: .git/config is for
both shared and private keys of main worktree (i.e. nothing is
changed from today). .git/worktrees/xx/config.worktree is for
private keys only (and
Long ago, I documented a corruption recovery I did and gave
some C code that I used to help find a flipped bit. I had
to fix a similar case recently, and I ended up writing a few
more tools. I hope nobody ever has to use these, but it
does not hurt to share them, just in case.
Signed-off-by:
40 matches
Mail list logo
