On 25.3.2015 23:53 Michael Haggerty wrote:
On 03/23/2015 05:04 PM, Petr Stodulka wrote:
git goes into an infinite loop due to broken symlink (minimal reproducer
[0]). Affected code is in function
resolve_ref_unsafe in file refs.c - notice 'stat_ref'. There is comment
about problem with race
When you define $GIT_DIR/info/config.worktree, which contains of
gitignore-style patterns (*), config variables that match these
patterns will be saved in $GIT_DIR/config.worktree instead of
$GIT_DIR/config.
On the surface, they are just like any other variables. You can read
or modify them with
While commit 9f673f9 (gc: config option for running --auto in
background - 2014-02-08) helps reduce some complaints about 'gc
--auto' hogging the terminal, it creates another set of problems.
The latest in this set is, as the result of daemonizing, stderr is
closed and all warnings are lost. This
Before this path, the also sounded as if preserve was doing a rebase
as additional work that true would not do. Clarify this by saying
still instead of also.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
Documentation/git-pull.txt | 4 ++--
1 file changed, 2 insertions(+), 2
Kirill Marchuk 62mkv at mail.ru writes:
Hi everyone
I'm totally stuck with a following problem:
(censor cut)
...
But I believe that it might be due to my total misunderstanding of something
Anyway, I totally appreciate your help !
Thanks a lot
Kirill, frustrated
On Wed, Mar 25, 2015 at 09:58:45PM -0700, Junio C Hamano wrote:
We had this in git merge manual for eternity:
'git merge' msg HEAD commit...
[This] syntax (msg `HEAD` commit...) is supported for
historical reasons. Do not use it from the command line or in
new scripts.
Paul Tan pyoka...@gmail.com writes:
On Wed, Mar 25, 2015 at 01:25:07PM -0700, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
I've already queued the following and merged it to 'next'.
Thanks Matthieu and Eric for your reviews, and Johannes for following up
on this.
Will
On Wed, Mar 25, 2015 at 08:47:59PM +0100, Jens Lehmann wrote:
Am 25.03.2015 um 10:06 schrieb Patrick Steinhardt:
On Mon, Mar 23, 2015 at 10:32:27PM +0100, Jens Lehmann wrote:
Am 17.03.2015 um 08:56 schrieb Patrick Steinhardt:
[snip]
Hmm, cmd_deinit() seems to cope with submodules removed by
Ignoring a merge sounds like ignoring the changes a merge commit
introduces altogether, as if the merge commit was skipped or dropped from
history. But that is not what happens if this options is not specified.
Instead, what happens is that the separate commits a merge commit
introduces are
On Tue, Mar 24, 2015 at 03:21:24PM -0700, Junio C Hamano wrote:
* pw/remote-set-url-fetch (2014-11-26) 1 commit
- remote: add --fetch and --both options to set-url
This has not seen any activity for a few months since $gmane/261483;
is anybody still interested in resurrecting it?
I
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
While commit 9f673f9 (gc: config option for running --auto in
background - 2014-02-08) helps reduce some complaints about 'gc
--auto' hogging the terminal, it creates another set of problems.
The latest in this set is, as the result of
Sebastian Schuberth sschube...@gmail.com writes:
Before this path, the also sounded as if preserve was doing a rebase
as additional work that true would not do. Clarify this by saying
still instead of also.
I agree that the original also is confusing. I however wonder if
we even want still,
On Mon, Mar 23, 2015 at 06:39:20PM +0530, karthik nayak wrote:
All three commands select a subset of the repository’s refs and print the
result. There has been an attempt to unify these commands by Jeff King[3]. I
plan on continuing his work[4] and using his approach to tackle this
project.
On Sat, Mar 21, 2015 at 02:06:33PM -0400, David A. Wheeler wrote:
Warn cloners if there is no LICENSE* or COPYING* file that makes
the license clear. This is a useful warning, because if there is
no license somewhere, then local copyright laws (which forbid many uses)
and terms of service
Any comments from those who use or have their own code in Gitweb on
this topic?
* tf/gitweb-project-listing (2015-03-19) 5 commits
- gitweb: make category headings into links when they are directories
- gitweb: optionally set project category from its pathname
- gitweb: add a link under the
Thanks; this time I do not see whitespace breakages ;-)
Will queue with a minimum tweak of the log message.
--
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
On 26.03.2015 19:18, Junio C Hamano wrote:
Also, do not say that merge commits are *tried* to be recreated.
Good point. We will try but it might fail is better left unsaid
as that is true almost everywhere.
Exactly.
-p::
--preserve-merges::
-Instead of ignoring merges, try to
Before this path, the also sounded as if preserve was doing a rebase
as additional work that true would not do. Clarify this by omitting the
also and rewording the sentence a bit.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
Documentation/git-pull.txt | 5 ++---
1 file changed, 2
On Wed, Mar 25, 2015 at 08:36:41PM +0530, Shanti Swarup Tunga wrote:
Duy Nguyen and Stephen Robin , the two developers worked
on converting git-pull.sh to C code . But in the idea page it is
written that we should start with git-pull.sh. Should I worked on
git-pull.sh or other
Sebastian Schuberth sschube...@gmail.com writes:
Also, do not say that merge commits are *tried* to be recreated.
Good point. We will try but it might fail is better left unsaid
as that is true almost everywhere.
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
Phil Hord ho...@cisco.com writes:
The help text for the --force-with-lease option to git-push
does not parse cleanly. Clean up the wording and syntax to
be more sensible. Also remove redundant information in the
--force-with-lease alone description.
Signed-off-by: Phil Hord
On 26 Mar 2015, at 19:49, Junio C Hamano gits...@pobox.com wrote:
Any comments from those who use or have their own code in Gitweb on
this topic?
Thanks for chasing up my patches. I should have written a covering letter, to
say that you can see these patches in action at
That’s great dear, can you share link for those cooking videos
http://grokker.com/cooking too. Actually I am a new learner and I need
detailed information to execute everything properly. Thanks in advance for
your help.
--
View this message in context:
On Thu, Mar 26, 2015 at 12:58 AM, Junio C Hamano gits...@pobox.com wrote:
We had this in git merge manual for eternity:
'git merge' msg HEAD commit...
[This] syntax (msg `HEAD` commit...) is supported for
historical reasons. Do not use it from the command line or in
new
On 15-03-24 07:06 PM, Paul Mackerras wrote:
On Mon, Mar 23, 2015 at 12:03:37PM -0700, Junio C Hamano wrote:
Is it a good time for me to pull from you, or do you recommend me to
wait for a bit, expecting more? We'll go in the pre-release freeze
soon-ish, so I thought I should ping.
Now is
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/RelNotes/2.4.0.txt | 2 +-
Documentation/technical/api-error-handling.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.txt
Am 26.03.2015 um 14:30 schrieb Patrick Steinhardt:
On Wed, Mar 25, 2015 at 08:47:59PM +0100, Jens Lehmann wrote:
Am 25.03.2015 um 10:06 schrieb Patrick Steinhardt:
Optionally I could
implement `git gc --purge-submodule=submodule-name` as a second
way to access the feature so that we have a way
git diff --no-index refuses to compare if args are directory and file,
instead of usual diff.
Now git diff --no-index modifies args, if they're directory and file,
and diffs files, as usual diff does.
Changes are done in diff_no_index().
Helped-by: Junio C Hamano gits...@pobox.com
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Good news is that a few GSoC Microprojects have been merged already
to 'master'; from my vague recollection of past years, perhaps this
year's
An early preview release Git v2.4.0-rc0 is now available for testing
at the usual places. This cycle is turning out to be a product
excellence release---majority of the changes are bugfixes, about
one-third of which are also already in the v2.3.x maintenance track.
The tarballs are found at:
Sebastian Schuberth sschube...@gmail.com writes:
Instead of flattening the history by replaying each
non-merge commit to be rebased, preserve the shape of the
rebased history by recreating merge commits as well.
or something along that line, perhaps?
Hm, I'm not sure about
Dr Harry Thomas
Brondesbury, North West
Londyn Anglia
Drogi Przyjacielu.
Jestem dr Harry Thomas z Brondesbury, North West London, tutaj w Anglii.
Pracuję dla UBS Investment Bank Londyn. Piszę wam o propozycji biznesowych,
które będą z ogromną korzyścią dla nas obu. W moim departamencie,
Junio C Hamano gits...@pobox.com writes:
[...]
I think the current preserve-merges considers everything between
upstream and branch as commits to be rebased, and recreate
merges across these rebased tips of branches that are merged.
There however were repeated wishes (or wishful
Am 26.03.2015 um 22:17 schrieb Sergey Organov:
Junio C Hamano gits...@pobox.com writes:
There however were repeated wishes (or wishful misunderstandings ;-)
that there were a mode to rebuild the trunk, considering only the
commits on the first-parent chain as commits to be rebased,
recreating
On Thu, Mar 26, 2015 at 07:04:24PM +0700, Nguyễn Thái Ngọc Duy wrote:
When you define $GIT_DIR/info/config.worktree, which contains of
gitignore-style patterns (*), config variables that match these
patterns will be saved in $GIT_DIR/config.worktree instead of
$GIT_DIR/config.
Should it
Yurii Shevtsov unge...@gmail.com writes:
git diff --no-index refuses to compare if args are directory and file,
instead of usual diff.
Now git diff --no-index modifies args, if they're directory and file,
and diffs files, as usual diff does.
Changes are done in diff_no_index().
File file11 is copied from file2 and diff-tree correctly reports this file as
its the source, but the test expression was checking for file10 instead (which
was a file that also originated from file2). It is possible that the diff-tree
algorithm was updated in recent versions, which resulted in
Signed-off-by: Vitor Antunes vitor@gmail.com
---
t/t9814-git-p4-rename.sh |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh
index 95f4421..24008ff 100755
--- a/t/t9814-git-p4-rename.sh
+++
This patch set includes two small fixes to the rename test case. The fix to
support dash should be trivial, but in the fix to the copy detection test case
it isn't obvious to me what changed in diff-tree to result in a different file
being detected as the origin of a copy.
Vitor Antunes (2):
Vitor Antunes vitor@gmail.com writes:
This patch set includes two small fixes to the rename test case. The fix to
support dash should be trivial, but in the fix to the copy detection test case
it isn't obvious to me what changed in diff-tree to result in a different file
being detected as
Junio C Hamano gits...@pobox.com writes:
As to 1/2 the lack of esac is clearly a bug---any self respecting
POSIX shell should have executed it without complaining. But
s/should/shouldn't/; sorry for a noise.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a
On Fri, 27 Mar 2015 at 01:26 Junio C Hamano gits...@pobox.com wrote:
As to 1/2 the lack of esac is clearly a bug---any self respecting
POSIX shell should have executed it without complaining. But
changing from ':' to true should not be necessary---after all, the
colon is a more traditional way to
Here are a few patches to scratch my itches in diff --no-index I
have had for quite some time, but didn't feel strong enough to fix
them myself so far.
The first one is to make diff File Directory (and diff Directory
File) more useful by aligning its behaviour with more mainstream
diff
git diff --no-index was supposed to be a poor-man's approach to
allow using Git diff goodies outside of a Git repository, without
having to patch mainstream diff implementations.
Unlike a POSIX diff that treats diff D F (or diff F D) as a
request to compare D/F and F (or F and D/F) when D is a
When a commit changes a path P that used to be a file to a directory
and creates a new path P/X in it, git show would say that file P
was removed and file P/X was created for such a commit.
However, if we compare two directories, D1 and D2, where D1 has a
file D1/P in it and D2 has a directory
First of all, my sincere apologies for the inordinate delay in reply.
The user who created the mess went on leave. By the time he was back,
I got stuck in some other issue. Later, I took the log of 'history'
command from his machine because i wanted to first simulate the
scenario before i could
Michael J Gruber venit, vidit, dixit 24.03.2015 16:10:
t9119 refuses to run with svn versions greater than 1.6 since git svn
info does not even try to match the output of svn info for later
versions.
Adjust git svn info to match these versions and make t9119 run with
them. This requires the
The help text for the --force-with-lease option to git-push
does not parse cleanly. Clean up the wording and syntax to
be more sensible. Also remove redundant information in the
--force-with-lease alone description.
Signed-off-by: Phil Hord ho...@cisco.com
---
Documentation/git-push.txt | 14
48 matches
Mail list logo
