The current config is tailored to apache 2.2. Apache 2.4 fails to start
with it.
Adjust the config to apache 2.4.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Notes:
This is WIP and RFH. Apache does not start without mpm, and the lock
mechanism has changed. It will run
With the current config, apache 2.4.10 will not be started and the httpd
tests will not run.
Enable mod_unixd to make the httpd tests run.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Notes:
Basically, this is required since the switch from 2.2 to 2.4.
I'm wondering
correct but not sufficient.
3/3 gets httpd to run but svn does not connect. This is WIP and RFH,
and maybe requires rewriting lib-git-svn to use a config which depends
on the apache version (like lib-hhtpd does), or to leverage lib-httpd.
Michael J Gruber (3):
t/lib-httpd: load mod_unixd
t/lib-git
Currently, lib-git-svn checks a proper subset of the paths that
lib-httpd checks for apache modules.
Make it check the same set so that apache is run by one when it is run
by the other (provide ports have been set).
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Notes:
Again
Oliver Runge venit, vidit, dixit 06.04.2015 13:05:
Hallo, Mr. Hamano.
Thank you for your quick and detailed response.
On 5 April 2015 at 23:12, Junio C Hamano gits...@pobox.com wrote:
This is very much the designed behaviour, I would think. IIRC, the
user-format support of rev-list was
Phillip Susi venit, vidit, dixit 07.04.2015 16:06:
On 4/7/2015 9:40 AM, Michael J Gruber wrote:
Phillip Susi venit, vidit, dixit 02.04.2015 21:34:
I can't seem to get gitk to show notes, even when I give it
--notes. Does it just not handle notes?
Have you tried with --show-notes
Phillip Susi venit, vidit, dixit 02.04.2015 21:34:
I can't seem to get gitk to show notes, even when I give it --notes.
Does it just not handle notes?
Have you tried with --show-notes?
It works over here even without --show-notes, by the way, but I'm not on
Windows. Are you?
Michael
--
To
Junio C Hamano venit, vidit, dixit 30.03.2015 23:12:
Jonathon Mah m...@jonathonmah.com writes:
During a few years of discussing git operations with colleagues, I’ve
found the “git rebase --onto” operation particularly ambiguous. The
reason is that I always describe a rebase operation as
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
J Gruber g...@drmicha.warpmail.net
---
Notes:
While trying to increase my test run coverage I noticed that most of us
won't
run t9119 at all. Bad bad.
My svn is 1.8.11 (r1643975) on Fedora 21.
I would appreciate help with the following items:
TBC
Ralf Thielow venit, vidit, dixit 21.03.2015 22:21:
Am 21. März 2015 um 13:52 schrieb Phillip Sz phillip.sze...@gmail.com:
I think we should use it like this, as most open-source projects do.
Also we should use a space before the three dots as per
Jeff King venit, vidit, dixit 20.03.2015 21:13:
On Fri, Mar 20, 2015 at 04:02:39PM -0400, Jeff King wrote:
Yeah, that was my impression, too. I don't have svn installed on my
system, so I missed those ones. I don't have CVS either. That might be
worth following up on.
Hmm, that turned out
Junio C Hamano venit, vidit, dixit 20.03.2015 23:38:
Stefan Beller sbel...@google.com writes:
Thomas referencing reading the man page offline, made me wonder
why you wouldn't read the man pages itself as they can also be
carried around offline. But the striking point is on an iPad, which
All of these cases are moderate since they would most probably not
lead to missed failing tests: Either they would fail otherwise,
or fail a rm in test_when_finished only.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t2026-prune-linked-checkouts.sh | 4 ++--
t/t9158-git-svn
, 2007-01-24)
it is not clear how it would achieve that with the given steps.
Amend the test to include the second svn id to be tested for, and
change the tested refs to the ones which are to be expected, and which
make the test pass.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
Jeff King venit, vidit, dixit 20.03.2015 11:04:
This is a cleanup of the -chain lint I posted earlier:
http://thread.gmane.org/gmane.comp.version-control.git/265613/focus=265859
I don't know who came up with the idea for it originally, but the
concept certainly was floating in the back
Sundararajan R venit, vidit, dixit 19.03.2015 12:22:
Hi all,
I am a Computer Science sophomore at IIT Kanpur. I am interested in
contributing to git in GSoC 2015. I have been using git for the past one year
and am pretty comfortable with its commands which is what made me think about
Do we have a merge driver or something for the l10n files?
I'm trying to rebase an older branch on top of origin/next. My topic
branch has changes to git.pot (the old glossary command idea), and
rebasing produces a lot of conflicts due to simple line number changes
in the comments. (The de.po in
behavior which the patch breaks, then we should not apply the patch. If
the patch changes behavior in an expected way, then we should change the
test to match.
Helped-by: Michael J Gruber g...@drmicha.warpmail.net
Helped-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Nguyễn Thái Ngọc Duy pclo
Junio C Hamano venit, vidit, dixit 10.03.2015 18:06:
Michael J Gruber g...@drmicha.warpmail.net writes:
So it didn't take too long to convince me after all :)
Here comes Junio's version, preceded by a cleanup of the color
setting and resetting for decorations.
Junio C Hamano (1):
log
Junio C Hamano venit, vidit, dixit 10.03.2015 21:20:
JFF stands for just for fun.
This is not meant to give out a model answer and is known to be
incomplete, but I was wondering if it would be a better direction to
allow - as a stand-in for @{-1} everywhere we allow a branch
name, losing
Junio C Hamano venit, vidit, dixit 10.03.2015 03:03:
Michael J Gruber g...@drmicha.warpmail.net writes:
Junio C Hamano venit, vidit, dixit 06.03.2015 20:03:
Michael J Gruber g...@drmicha.warpmail.net writes:
Note that now a checked branch is listed twice, once as target
by the spacing) as well as their relationshsip.
As a consequence, HEAD without any - denotes a detached HEAD now.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Notes:
The patch is really Junio's now.
I just simplified the if's and added colors and tests.
The spaces around
Except for the separator, all output items reset the color immediately.
Do the same for the separator.
This affects only cases where setting color A does not override color B,
such as when one is forground and one background.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
log
So it didn't take too long to convince me after all :)
Here comes Junio's version, preceded by a cleanup of the color
setting and resetting for decorations.
Junio C Hamano (1):
log: decorate HEAD with branch name
Michael J Gruber (1):
log-tree: properly reset colors
log-tree.c
Reported-by: Mladen B. mladen...@gmail.com
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/config.txt | 6 --
contrib/completion/git-completion.bash | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b
Kyle J. McKay venit, vidit, dixit 09.03.2015 21:03:
Depending on how gpg was built, it may issue the following
message to stderr when run:
Warning: using insecure memory!
When the test is collecting gpg output it is therefore not
enough to just match on a gpg: prefix it must also match
Christian Couder venit, vidit, dixit 07.03.2015 08:18:
Hi,
On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup d...@gnu.org wrote:
At some point of time I think it may be worth reevaluating the toxic
atmosphere against freelancers doing Git development.
My opinion on this is that the Git
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
For the record, the tests would need to change like this, and it makes
a lot of sense. After the change, i-t-a is not a change staged in
the index any more - and in fact in never was, as git commit shows.
t/t2203-add-intent.sh | 7
Junio C Hamano venit, vidit, dixit 06.03.2015 20:03:
Michael J Gruber g...@drmicha.warpmail.net writes:
git status and git branch let the user know when the HEAD is
detached, as well as the current branch, while git log --decorate does not.
Change the decoration by a non-detached HEAD
Gondek, Andreas venit, vidit, dixit 09.03.2015 10:02:
We used a merge driver to create a conflict semaphore file whenever a
merge conflict occurs in Atlassian Stash. This worked for several
month until we got to update our Git version because of another
problem.
That is the first issue: Can
Kyle J. McKay venit, vidit, dixit 09.03.2015 06:32:
On Mar 8, 2015, at 18:22, brian m. carlson wrote:
On Sun, Mar 08, 2015 at 06:15:55PM -0400, Eric Sunshine wrote:
On Sun, Mar 8, 2015 at 6:04 PM, brian m. carlson
sand...@crustytoothpaste.net wrote:
Perhaps this is better?
Unfortunately
and wording.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Notes:
v2 uses the info from refactored wt-status.
In addition, it tries to make sure that branch and status use the same
strings:
HEAD detached at %s
* (HEAD detached at %s)
(status first line
So here's a little refactoring of wt-status, to help branch
use the same logic regarding from/at for a detached HEAD.
Michael J Gruber (2):
wt-status: refactor detached HEAD analysis
branch: name detached HEAD analogous to status
builtin/branch.c | 13 ++---
t/t3203-branch
Gondek, Andreas venit, vidit, dixit 06.03.2015 14:31:
The archive contains my test repository, the merge driver and the .gitconfig
of the user. We don't have a global .gitconfig.
Thanks for the test repo!
Alas, the merge driver gets executed with v1.9.0-rc3, v1.8.5 and v1.7.0,
at least over
to wt_status_get_detached_from(), too,
and store the boolean result in state-detached_at.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
wt-status.c | 6 +++---
wt-status.h | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index 29666d0
so that it preserves commit
messages independent of the default, unless the user has set config for commit
or the message is amended with -s or -x.
Reported-by: Christoph Anton Mitterer cales...@scientia.net
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
sequencer.c | 5
Michael J Gruber venit, vidit, dixit 06.03.2015 17:15:
... and maybe the patch title should be different for v2, too:
log: decorate non-detached HEAD differently
Not my day today it seems, but this is my last patch for today.
Michael
--
To unsubscribe from this list: send the line unsubscribe
in the same way as we prefix tags by tag: .
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Notes:
v2 decorates the HEAD pointing to master as HEAD-master, a detached
HEAD just as HEAD. The - hopefully conveys the symlink nature - a
= would be confusing.
Somehow I
Michael J Gruber venit, vidit, dixit 06.03.2015 10:43:
...
So, I both managed to
- omit the cover letter subject (which format-patch helpfully does *not*
fill in from the branch description) and
- mis-copy the in-reply-to message id (to a non-existent one).
Thunderbird user
Sorry.
I
Gondek, Andreas venit, vidit, dixit 05.03.2015 14:30:
Hello,
after upgrading the Git installation on one of our development
servers from 1.9.0-rc3 to 2.3.1 we are experiencing strange behavior
of merge drivers.
A merge driver registered as * merge=name_of_merge_driver in the
Junio C Hamano venit, vidit, dixit 05.03.2015 23:24:
Christian Couder christian.cou...@gmail.com writes:
On Tue, Feb 24, 2015 at 11:09 PM, Jeff King p...@peff.net wrote:
I wanted to make one more announcement about this, since a few more
details have been posted at:
http://git-merge.com/
benefit is that future tests can add such files
that are purely for use by the observer, i.e. the tests themselves,
by naming them as expect-foo and/or output-bar.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7508-status.sh | 78
header it stands out by itself already due
to quinti-dashed line.
Junio C Hamano (1):
t7508: .gitignore 'expect' and 'output' files
Michael J Gruber (2):
t7508: test git status -v
commit/status: show the index-worktree diff with -v -v
Documentation/git-commit.txt | 4 ++
t/t7508-status.sh
; the latter preceded by 50*- to make it stick out more.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-commit.txt | 4
t/t7508-status.sh| 11 +++
wt-status.c | 20
3 files changed, 35 insertions(+)
diff
status -v had no test. Include one.
This also requires changing the .gitignore subtests, which is a good thing:
they include testing a .gitignore pattern now.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7508-status.sh | 14 --
1 file changed, 12 insertions(+), 2
benefit is that future tests can add such files
that are purely for use by the observer, i.e. the tests themselves,
by naming them as expect-foo and/or output-bar.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7508-status.sh | 78
think so, although
having the STATUS_HEADER color to be different may help.)
- Do we want the header line also for status -v? (I would say yes, but that
would be a change to current behaviour.)
Junio C Hamano (1):
t7508: .gitignore 'expect' and 'output' files
Michael J Gruber (2):
t7508: test
.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-commit.txt | 4
t/t7508-status.sh| 10 ++
wt-status.c | 16
3 files changed, 30 insertions(+)
diff --git a/Documentation/git-commit.txt b/Documentation/git
status -v had no test. Include one.
This also requires changing the .gitignore subtests, which is a good thing:
they include testing a .gitignore pattern now.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7508-status.sh | 14 --
1 file changed, 12 insertions(+), 2
David Lang venit, vidit, dixit 04.03.2015 01:53:
On Tue, 3 Mar 2015, Shawn Pearce wrote:
On Sun, Mar 1, 2015 at 7:29 PM, Stefan Beller sbel...@google.com wrote:
bitquabit.com/post/unorthodocs-abandon-your-dvcs-and-return-to-sanity
Indeed, a DVCS like Git or Hg does not fit everyone. And
Kevin Daudt venit, vidit, dixit 04.03.2015 00:12:
Only behaviour with these options are currently explained. Add
explanation what the default behaviour is.
Signed-off-by: Kevin Daudt m...@ikke.info
---
Documentation/git-remote.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git
Junio C Hamano venit, vidit, dixit 03.03.2015 21:06:
Michael J Gruber g...@drmicha.warpmail.net writes:
Junio C Hamano venit, vidit, dixit 02.03.2015 20:43:
Anders Kaseorg ande...@mit.edu writes:
Signed-off-by: Anders Kaseorg ande...@mit.edu
---
t/t5516-fetch-push.sh | 2 +-
1 file
Anders Kaseorg venit, vidit, dixit 04.03.2015 10:43:
On Wed, 4 Mar 2015, Michael J Gruber wrote:
If there is no pushurl:
url will be used as the URL for fetch and as the URL for push.
if we are pushing and there is pushinsteadof for (part of) url
subsitute that within url
else
Junio C Hamano venit, vidit, dixit 03.03.2015 23:26:
Junio C Hamano gits...@pobox.com writes:
Michael J Gruber g...@drmicha.warpmail.net writes:
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7508-status.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t
Junio C Hamano venit, vidit, dixit 03.03.2015 22:26:
Michael J Gruber g...@drmicha.warpmail.net writes:
+diff --git INDEX=staged-for-commit/dir1/modified
WORKTREE=not-staged-for-commit/dir1/modified
+index e69de29..d00491f 100644
+--- INDEX=staged-for-commit/dir1/modified
WORKTREE
Jeff King venit, vidit, dixit 04.03.2015 11:54:
On Thu, Feb 26, 2015 at 03:23:14PM +0100, Michal Hocko wrote:
The commit in the middle was ammended to have committer date in the
past.
$ git describe --contains d63972e4e4e7eda0444e56739ad09bfbc476b9bd
tag~1
but
$ git describe --contains
Junio C Hamano venit, vidit, dixit 02.03.2015 20:43:
Anders Kaseorg ande...@mit.edu writes:
Signed-off-by: Anders Kaseorg ande...@mit.edu
---
t/t5516-fetch-push.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index
H.Merijn Brand venit, vidit, dixit 03.03.2015 16:30:
On Tue, 03 Mar 2015 15:55:48 +0100, Michael J Gruber
g...@drmicha.warpmail.net wrote:
H.Merijn Brand venit, vidit, dixit 19.02.2015 19:56:
On Thu, 19 Feb 2015 14:21:11 +0100, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Jeff, you
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7508-status.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 8ed5788..4989e98 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -133,6 +133,12 @@ test_expect_success
in addition to the HEAD index diff. This allows a review of unstaged
changes which might be missing from the commit.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-commit.txt | 4
t/t7508-status.sh| 43 +++
wt
.
The wording for the new prefixes is chosen after the status hints, although
they are not localised.
Michael J Gruber (2):
t7508: test git status -v
commit/status: show the index-worktree diff with -v -v
Documentation/git-commit.txt | 4
t/t7508-status.sh| 49
H.Merijn Brand venit, vidit, dixit 19.02.2015 19:56:
On Thu, 19 Feb 2015 14:21:11 +0100, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Jeff, you got it wrong. You should do the hard part and leave the easy
part to us!
Thanks anyways, I'll add this to my HP_UX branch.
I did
shawn wilson venit, vidit, dixit 02.03.2015 14:25:
How do I move commits I haven't pushed into a new branch?
% git log origin..master --pretty=format:'%h'
f7d3a19
1f186c9
66d99f6
Which I'd like to be in a new branch.
Do you want them to be on the new branch as they are, i.e. as
Francis Moreau venit, vidit, dixit 02.03.2015 14:36:
Hi,
On 03/02/2015 02:08 PM, Michael J Gruber wrote:
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-remote.txt | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/git
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-remote.txt | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index a77607b..f3f6f0d 100644
--- a/Documentation/git-remote.txt
+++ b
Alexander Kuleshov venit, vidit, dixit 02.03.2015 14:55:
This patch provides ability to pass -v/--verbose option to the
git hash-object command. hash-object will print not only hash,
but also file path of a file from what hash was calculated.
It can be useful in scripting, especially with
Torsten Bögershausen venit, vidit, dixit 01.03.2015 11:25:
On 2015-03-01 08.39, Mårten Kongstad wrote:
[]
index ed7e093..128f7bf 100755
--- a/t/t4047-diff-dirstat.sh
+++ b/t/t4047-diff-dirstat.sh
@@ -973,4 +973,15 @@ test_expect_success 'diff.dirstat=future_param,0,lines
should warn, but
Mårten Kongstad venit, vidit, dixit 01.03.2015 17:01:
On Sun, Mar 01, 2015 at 03:23:37PM +0100, Michael J Gruber wrote:
[]
If I would have had to guess from the documentation: What does git diff
--dirstat --shortstat do? I would have answered: It displays both the
dirstat and the shortstat
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
po/de.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/de.po b/po/de.po
index 11fbd0f..aff3109 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4613,7 +4613,7 @@ msgstr Ungültiger \cleanup\ Modus %s
#: builtin
Junio C Hamano venit, vidit, dixit 26.02.2015 20:49:
Michael J Gruber g...@drmicha.warpmail.net writes:
Hmm. With --edit, current config being in effect should be expected,
right? So how about:
In case of no conflict: force cleanup=verbatim unless --edit is used?
Perhaps something like
Junio C Hamano venit, vidit, dixit 26.02.2015 21:59:
Michael J Gruber g...@drmicha.warpmail.net writes:
So, as a summary of the discussion, it seems it's time to switch the
default to --textconv for git grep?
Hmmm, why?
Nobody seems to be asking for such a change in this thread
Thomas Klausner venit, vidit, dixit 26.02.2015 15:12:
Hi!
I've played around with git and found that 'git mv' does not honor
what I tell it to do:
wiz@yt:~ mkdir a
wiz@yt:~ cd a
wiz@yt:~/a git init .
Initialized empty Git repository in /home/wiz/a/.git/
wiz@yt:~/a touch a
wiz@yt:~/a
Jeff King venit, vidit, dixit 25.02.2015 20:11:
On Wed, Feb 25, 2015 at 11:01:22AM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
So I think _if_ using diff attributes is enough for this purpose, then
there is no code to be written. But if somebody wants to draw a
Junio C Hamano venit, vidit, dixit 25.02.2015 19:22:
Michael J Gruber g...@drmicha.warpmail.net writes:
Junio C Hamano venit, vidit, dixit 24.02.2015 19:29:
Michael J Gruber g...@drmicha.warpmail.net writes:
Hmm, wouldn't it introduce a grave regression for users who
explicitly ask
Junio C Hamano venit, vidit, dixit 24.02.2015 19:29:
Michael J Gruber g...@drmicha.warpmail.net writes:
Hmm, wouldn't it introduce a grave regression for users who
explicitly ask to clean crufty messages up (by setting their own
commit.cleanup configuration) if you unconditionally force
Stefan Beller venit, vidit, dixit 25.02.2015 01:34:
On Tue, Feb 24, 2015 at 3:56 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
Hi Junio,
On 2015-02-24 19:25, Junio C Hamano wrote:
On Tue, Feb 24, 2015 at 9:32 AM, Matthieu Moy
Junio C Hamano venit, vidit, dixit 23.02.2015 20:23:
Michael J Gruber g...@drmicha.warpmail.net writes:
Many options are paths, but not files. Introduce OPT_PATH which does
the same path processing as OPT_FILENAME but allows to name the argument.
...
diff --git a/parse-options.h b/parse
Junio C Hamano venit, vidit, dixit 23.02.2015 19:54:
Michael J Gruber g...@drmicha.warpmail.net writes:
sequencer calls commit with default options, which implies
--cleanup=default unless the user specified something else in their
config. This leads to cherry-picked commits getting a cleaned
--to requires a directory, not a file. Say so in the usage string.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/checkout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 8b2bf20..8cdcd07 100644
so that it preserves commit
messages independent of the defaults and user config for commit.
Reported-by: Christoph Anton Mitterer cales...@scientia.net
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Notes:
All tests run fine with this changed behavior. I don't know
whether
Junio C Hamano venit, vidit, dixit 22.02.2015 22:41:
[Stalled]
* nd/list-files (2015-02-09) 21 commits
. t3080: tests for git-list-files
. list-files: -M aka diff-cached
. list-files -F: show submodules with the new indicator ''
. list-files: add -F/--classify
. list-files: show
Jeff King venit, vidit, dixit 23.02.2015 15:42:
On Mon, Feb 23, 2015 at 03:16:59PM +0100, Michael J Gruber wrote:
--to requires a directory, not a file. Say so in the usage string.
Sounds like a good goal, but...
-OPT_FILENAME(0, to, opts.new_worktree
Marc Branchaud venit, vidit, dixit 23.02.2015 16:12:
On 15-02-22 12:38 PM, Michael J Gruber wrote:
git status carefully names a detached HEAD at resp. from a rev or
ref depending on whether the detached HEAD has moved since. git branch
always uses from, which can be confusing, because a status
converts OPT_STRING to OPT_PATH where it makes sense
4/4 converts OPT_FILENAME to OPT_PATH for checkout --to
1/4, 2/4 should apply on top of origin/next independently.
3/4 needs 1/4.
4/4 needs 1/4 and is on top of nd/multiple-worktrees.
Michael J Gruber (4):
parse-options: introduce OPT_PATH
Some commands use OPT_STRING to specify a file argument. Let them use
OPT_FILENAME so that they can profit from path prefixing.
This excludes low-level commands like the credential helpers.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
This could be before 1/4 but seemed more
--to requires a directory, not a file. Say so in the usage string.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
I did not spot any other misuses of OPT_FILENAME (for non-files).
builtin/checkout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin
Many options are paths, but not files. Introduce OPT_PATH which does
the same path processing as OPT_FILENAME but allows to name the argument.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/technical/api-parse-options.txt | 5 +
parse-options.h
Some commands use OPT_STRING to specify a path type argument. Let them
use OPT_PATH so that they can profit from path prefixing.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/clone.c | 4 ++--
builtin/init-db.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions
Junio C Hamano venit, vidit, dixit 22.02.2015 20:21:
Michael J Gruber g...@drmicha.warpmail.net writes:
git status carefully names a detached HEAD at resp. from a rev or
ref depending on whether the detached HEAD has moved since. git branch
always uses from, which can be confusing, because
and wording.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Notes:
The wording is still different:
HEAD detached at %s
* (detached at %s)
for status (line 1) resp. branch (line 2). Maybe it's worthwhile to use the
exact same string so that l10n output
Jeff King venit, vidit, dixit 20.02.2015 02:48:
On Thu, Feb 19, 2015 at 02:21:11PM +0100, Michael J Gruber wrote:
It passes NO_ICONV through to the test suite, sets up a prerequisite,
disables some test scripts which are purely about i18n (e.g.,
t3900-i18n-commit), and marks some
Junio C Hamano venit, vidit, dixit 19.02.2015 19:10:
Michael J Gruber g...@drmicha.warpmail.net writes:
Randall S. Becker venit, vidit, dixit 19.02.2015 14:32:
git symbolic-ref --short HEAD
That errors out when HEAD is detached.
Isn't that what you would want to happen anyway
[just for chuckles, no flames please]
$ hg branch topic
Arbeitsverzeichnis wurde als Zweig topic markiert
(branches are permanent and global, did you want a bookmark?)
I have no idea since when hg cautions against using their version of
branches (embedded into the commits), but that line made me
Junio C Hamano venit, vidit, dixit 18.02.2015 20:49:
Michael J Gruber g...@drmicha.warpmail.net writes:
Yep, it very well is. Also, that approach would tell you which branch is
checked out, though I don't consider that git log's business.
OTOH, it's backwards in the sense that it marks
Kyle J. McKay venit, vidit, dixit 19.02.2015 02:17:
On Feb 18, 2015, at 01:46, Michael J Gruber wrote:
Armin Ronacher venit, vidit, dixit 16.02.2015 14:29:
Hi,
On 16/02/15 13:09, Ævar Arnfjörð Bjarmason wrote:
We should definitely make recovery like this harder, but is there a
reason
Jeff King venit, vidit, dixit 18.02.2015 19:57:
On Wed, Feb 18, 2015 at 10:47:16AM -0800, Junio C Hamano wrote:
It seems like we could use
(cd src tar cf - .) | (cd dst tar xf -)
here as a more portable alternative. I don't think we can rely on rsync
being everywhere.
Thanks; I
H.Merijn Brand venit, vidit, dixit 19.02.2015 12:14:
On Thu, 19 Feb 2015 11:33:01 +0100, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Jeff King venit, vidit, dixit 18.02.2015 19:57:
On Wed, Feb 18, 2015 at 10:47:16AM -0800, Junio C Hamano wrote:
It seems like we could use
(cd src
an extra mode that does create-store only without the reset,
so that one can ceckpoint the sate and keep working on it.
Suggested-by: Kyle J. McKay mack...@gmail.com
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Notes:
I'm not sure about how to best expose this mode:
git
Jeff King venit, vidit, dixit 19.02.2015 13:54:
On Thu, Feb 19, 2015 at 12:20:02PM +0100, Michael J Gruber wrote:
OK, so we should use NO_ICONV on HP_UX then.
Failing so many tests with NO_ICONV is certainly not ideal, but I'm not
sure we should care to protect so many tests
301 - 400 of 782 matches
Mail list logo
