Jeff King schrieb am 15.01.2015 um 15:31:
> On Thu, Jan 15, 2015 at 03:23:08PM +0100, Michael J Gruber wrote:
>
>> If an --author argument is specified but does not contain a '>' then git
>> tries
>> to find the argument within the exiting authors; and gi
orktree in addition to HEAD index diff. This allows to review unstaged
changes which might be missing from the commit.
Signed-off-by: Michael J Gruber
---
Also, the git status man page does not mention -v at all, and the doc
for git status (long format) and the status parts of the git commit
man page sho
Francesc Zacarias schrieb am 15.01.2015 um 14:55:
> Hi!
>
> I noticed that git produces differing output for
> "git show --pretty:format show" and "git show --format", even though
> the man page says that both are equivalent.
> "git show --format" always appends an empty line at the end. The only
Junio C Hamano schrieb am 15.01.2015 um 21:11:
> Michael J Gruber writes:
>
>> git commit and git status in long format show the diff between HEAD
>> and the index when given -v. This allows previewing a commit to be made.
>>
>> They also list tracked files with u
Josh Triplett schrieb am 19.01.2015 um 02:29:
> I'd like to use git-log to generate a Debian changelog file (with one
> entry per commit), which has entries like this:
>
> package-name (version-number) unstable; urgency=low
>
> * ...
>
> -- Example Person RFC822-date
>
> Since I'm intention
Jason Pyeron schrieb am 16.01.2015 um 21:05:
>> -Original Message-
>> From: Junio C Hamano
>> Sent: Friday, January 16, 2015 14:53
>>
>> Jonathan Nieder writes:
>>
would there be interest in accepting a patch for
%Gs - the raw GPG text from the commit
%Gf - the key fin
Alexander Kuleshov schrieb am 17.01.2015 um 08:35:
> This patch adds support -d/--dry-run option for branch(es) deletion.
> If -d/--dry-run option passed to git branch -d branch..., branch(es)
> will not be removed, instead just print list of branches that are
> to be removed.
>
> For example:
>
Noralf Trønnes schrieb am 20.01.2015 um 23:26:
> Den 20.01.2015 23:18, skrev Nico Williams:
>> On Tue, Jan 20, 2015 at 10:38:40PM +0100, Noralf Trønnes wrote:
>>> Yes:
>>> $ echo Noralf Trønnes | xxd
>>> 000: 4e6f 7261 6c66 2054 72f8 6e6e 6573 0aNoralf Tr.nnes.
>>>
>>> Is there a command I
j...@joshtriplett.org schrieb am 21.01.2015 um 00:11:
> On Tue, Jan 20, 2015 at 04:49:53PM -0500, Jeff King wrote:
>> On Mon, Jan 19, 2015 at 05:17:25PM -0800, Josh Triplett wrote:
>>
Can you be a bit more specific about the type count that you are after?
"git describe" counts commits sin
Scott Schmit schrieb am 22.01.2015 um 02:37:
> On Mon, Jan 19, 2015 at 03:20:51PM +0100, Michael J Gruber wrote:
>> Alexander Kuleshov schrieb am 17.01.2015 um 08:35:
>>> This patch adds support -d/--dry-run option for branch(es) deletion.
>>> If -d/--dry-run option pas
This message is about leaving orphaned commits behind, not about
behing behind an upstream branch. Try to make this clear.
Signed-off-by: Michael J Gruber
---
po/de.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/de.po b/po/de.po
index 5a93ea8..65a8ac0 100644
--- a
Signed-off-by: Michael J Gruber
---
po/de.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/de.po b/po/de.po
index 65a8ac0..6af1599 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3559,21 +3559,21 @@ msgid ""
"Warning: you are leaving %d commit behind, not connec
cify a valid complete author
name.
Rename the error message to make it clearer that the failure has two
reasons in this case.
(This codepath is touched only when we know already that the argument
cannot be a completely wellformed author ident.)
Signed-off-by: Michael J Gruber
---
There's really
As per the code, the --repo option is equivalent to the
argument to 'git push'. [It exists for historical reasons, back from the time
when options had to come before arguments.]
Say so. [But not that.]
Signed-off-by: Michael J Gruber
---
Thanks for digging up the thread, Junio. I n
Mike Hommey schrieb am 28.01.2015 um 07:23:
> Hi,
>
> diff-format.txt says this:
>
> An output line is formatted this way:
> (snip)
>
> That is, from the left to the right:
>
> (snip)
> . status, followed by optional "score" number.
>
> (snip)
> Status letters C and R are always
Junio C Hamano schrieb am 29.01.2015 um 07:18:
> Olaf Hering writes:
>
>> On Tue, Jan 27, Junio C Hamano wrote:
>>
What file timestamp should be used for them? Likely "../version"?
>>>
>>> I tend to think the "Last updated" timestamp taken from the
>>> filesystem timestamp is a bad practice
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 for why you don't use "git reset --keep" instead of --hard?
> This was only the second time in years of
Julien Cretel venit, vidit, dixit 17.02.2015 00:40:
> On Mon, Feb 16, 2015 at 11:15 PM, Junio C Hamano wrote:
>> Julien Cretel writes:
>>
>>> As of Git 2.3.0, the output of "git log --decorate" is ambiguous as to
>>> whether the HEAD is detached or not.
>>
>> It sounds as if you are reporting som
n the
same way as we prefix tags by "tag: ".
Signed-off-by: Michael J Gruber
---
This turned out to be easy to do, though I am still undecided.
Personally, I like to think of refs as objects (and have implemented refname
objects in the past), but that view is not too popular.
So, maybe th
H.Merijn Brand venit, vidit, dixit 18.02.2015 17:00:
> On Wed, 10 Dec 2014 23:46:25 -0800, Junio C Hamano
> wrote:
>
>> Hello, all.
>>
>> H. Merijn Brand runs a few HP-UX boxes to help perl5 and other open
>> source communities, wants help porting more recent Git on these
>> boxes, running HP-UX
Junio C Hamano venit, vidit, dixit 18.02.2015 18:07:
> Michael J Gruber writes:
>
>> "git branch" will tell you your branches and which one is checked out
>> (or HEAD); "git status" will tell you the latter.
>>
>> "git log" is about
Junio C Hamano venit, vidit, dixit 18.02.2015 20:49:
> Michael J Gruber 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 "b
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 every
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 definit
H.Merijn Brand venit, vidit, dixit 19.02.2015 12:14:
> On Thu, 19 Feb 2015 11:33:01 +0100, Michael J Gruber
> 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:
>>>
>>>>>
rced to do "git stash save && git
stash apply".
Provide 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"
Signed-off-by: Michael J Gruber
---
Note
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
>>>&g
Randall S. Becker venit, vidit, dixit 19.02.2015 14:32:
> git symbolic-ref --short HEAD
That errors out when HEAD is detached.
git rev-parse --symbolic-full-name [--abbrev-ref] HEAD
returns the branch name or HEAD. Though it's a bit difficult to discover.
I guess git 3.0 will have "git branch"
Junio C Hamano venit, vidit, dixit 19.02.2015 19:10:
> Michael J Gruber 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
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.,
>>> t
[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
ved detached HEAD.
Make "git branch" use the same logic and wording.
Signed-off-by: Michael J Gruber
---
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
Junio C Hamano venit, vidit, dixit 22.02.2015 20:21:
> Michael J Gruber 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"
>&
Jim Garrison venit, vidit, dixit 05.11.2013 18:16:
> I'm doing a one-time migration of an svn project. For historical reasons our
> repo layout is weird:
>
> trunk/reporting/reporting_app
>
> tags/something_else
>
> tags/reporting_app-2.3.45
> tags/reporting_app-2.4.46
encer use "--cleanup=verbatim" so that it preserves commit
messages independent of the defaults and user config for "commit".
Reported-by: Christoph Anton Mitterer
Signed-off-by: Michael J Gruber
---
Notes:
All tests run fine with this changed behavior. I don't know
wh
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:
--to requires a directory, not a file. Say so in the usage string.
Signed-off-by: Michael J Gruber
---
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
--- a/builtin/checkout.c
+++ b
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(
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
---
Documentation/technical/api-parse-options.txt | 5 +
parse-options.h | 2 ++
2
makes sense
3/4 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-op
--to requires a directory, not a file. Say so in the usage string.
Signed-off-by: Michael J Gruber
---
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/checkout.c
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
---
builtin/clone.c | 4 ++--
builtin/init-db.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin
Some commands use OPT_STRING to specify a 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
---
This could be before 1/4 but seemed more logical here.
archive.c
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 bra
Junio C Hamano venit, vidit, dixit 23.02.2015 19:54:
> Michael J Gruber writes:
>
>> sequencer calls "commit" with default options, which implies
>> "--cleanup=default" unless the user specified something else in their
>> config. This leads to cherr
Junio C Hamano venit, vidit, dixit 23.02.2015 20:23:
> Michael J Gruber 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-option
Stefan Beller venit, vidit, dixit 25.02.2015 01:34:
> On Tue, Feb 24, 2015 at 3:56 PM, Matthieu Moy
> wrote:
>> Johannes Schindelin writes:
>>
>>> Hi Junio,
>>>
>>> On 2015-02-24 19:25, Junio C Hamano wrote:
On Tue, Feb 24, 2015 at 9:32 AM, Matthieu Moy
wrote:
> About the proposal:
Junio C Hamano venit, vidit, dixit 24.02.2015 19:29:
> Michael J Gruber 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 yo
Junio C Hamano venit, vidit, dixit 25.02.2015 19:22:
> Michael J Gruber writes:
>
>> Junio C Hamano venit, vidit, dixit 24.02.2015 19:29:
>>> Michael J Gruber writes:
>>>
>>>>> Hmm, wouldn't it introduce a grave regression for users who
&g
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 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
>>> distinc
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
Thomas Klausner venit, vidit, dixit 26.02.2015 15:58:
> On Thu, Feb 26, 2015 at 03:45:13PM +0100, Michael J Gruber wrote:
>> Thomas Klausner venit, vidit, dixit 26.02.2015 15:12:
>>> Hi!
>>>
>>> I've played around with git and found that 'g
Junio C Hamano venit, vidit, dixit 26.02.2015 21:59:
> Michael J Gruber 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
Junio C Hamano venit, vidit, dixit 26.02.2015 20:49:
> Michael J Gruber 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 i
Signed-off-by: Michael J Gruber
---
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/
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
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
Signed-off-by: Michael J Gruber
---
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/Documentation/git-remote.txt
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
>> ---
>> Documentation/git-remote.txt | 5 -
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>>
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.
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 wit
Signed-off-by: Michael J Gruber
---
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 'status
orktree 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
---
Documentation/git-commit.txt | 4
t/t7508-status.sh| 43 +++
wt-status.c
at for '-v' already, although that
would be a change in behavior.
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
Document
H.Merijn Brand venit, vidit, dixit 19.02.2015 19:56:
> On Thu, 19 Feb 2015 14:21:11 +0100, Michael J Gruber
> 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
Junio C Hamano venit, vidit, dixit 02.03.2015 20:43:
> Anders Kaseorg writes:
>
>> Signed-off-by: Anders Kaseorg
>> ---
>> 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 85c7fec..594d7a6 10
H.Merijn Brand venit, vidit, dixit 03.03.2015 16:30:
> On Tue, 03 Mar 2015 15:55:48 +0100, Michael J Gruber
> wrote:
>
>> H.Merijn Brand venit, vidit, dixit 19.02.2015 19:56:
>>> On Thu, 19 Feb 2015 14:21:11 +0100, Michael J Gruber
>>> wrote:
>>>
>
Junio C Hamano venit, vidit, dixit 03.03.2015 21:06:
> Michael J Gruber writes:
>
>> Junio C Hamano venit, vidit, dixit 02.03.2015 20:43:
>>> Anders Kaseorg writes:
>>>
>>>> Signed-off-by: Anders Kaseorg
>>>> ---
>>>> t/
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
Junio C Hamano venit, vidit, dixit 03.03.2015 23:26:
> Junio C Hamano writes:
>
>> Michael J Gruber writes:
>>
>>> Signed-off-by: Michael J Gruber
>>> ---
>>> t/t7508-status.sh | 6 ++
>>> 1 file changed, 6 insertions(+)
>>>
&
Junio C Hamano venit, vidit, dixit 03.03.2015 22:26:
> Michael J Gruber 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
&
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 descri
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 wrote:
>>> bitquabit.com/post/unorthodocs-abandon-your-dvcs-and-return-to-sanity
>>
>> Indeed, a DVCS like Git or Hg does not fit everyone. And neither do
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
> ---
> Documentation/git-remote.txt | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/Documen
sts. An added 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
---
t/t7508-status.sh | 78 ++-
1 file
x27;t 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' f
"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
---
t/t7508-status.sh | 14 --
1 file changed, 12 insertions(+), 2 deletion
e in the status
part.
Signed-off-by: Michael J Gruber
---
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-comm
there is only a "second" 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
D
sts. An added 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
---
t/t7508-status.sh | 78 ++-
1 file
the status
part; the latter preceded by 50*"-" to make it stick out more.
Signed-off-by: Michael J Gruber
---
Documentation/git-commit.txt | 4
t/t7508-status.sh| 11 +++
wt-status.c | 20
3 files changed, 35 insertions(+)
"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
---
t/t7508-status.sh | 14 --
1 file changed, 12 insertions(+), 2 deletion
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
Junio C Hamano venit, vidit, dixit 05.03.2015 23:24:
> Christian Couder writes:
>
>> On Tue, Feb 24, 2015 at 11:09 PM, Jeff King wrote:
>>> I wanted to make one more announcement about this, since a few more
>>> details have been posted at:
>>>
>>> http://git-merge.com/
>>>
>>> since my last a
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=" in the
> .gitattributes is now e
encer use "--cleanup=verbatim" 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
Signed-off-by: Michael J Gruber
---
sequencer.c |
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
ved detached HEAD.
Make "git branch" use the same logic and wording.
Signed-off-by: Michael J Gruber
---
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
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-b
bit of analysis to wt_status_get_detached_from(), too,
and store the boolean result in state->detached_at.
Signed-off-by: Michael J Gruber
---
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..e7c1a4b 100
more information about the
decoration item itself in the same way as we prefix tags by "tag: ".
Signed-off-by: Michael J Gruber
---
Notes:
v2 decorates the HEAD pointing to master as "HEAD->master", a detached
HEAD just as "HEAD". The "->"
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 "unsubs
Junio C Hamano venit, vidit, dixit 06.03.2015 20:03:
> Michael J Gruber 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.
>>
>&
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: Ca
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
>>> wrote:
Perhaps this is better?
Unfortunately when run
Christian Couder venit, vidit, dixit 07.03.2015 08:18:
> Hi,
>
> On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup 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 communi
Signed-off-by: Michael J Gruber
---
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-int
Scott Chacon venit, vidit, dixit 09.03.2015 18:14:
> Hey,
>
> On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup wrote:
>>> On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber
>>> wrote:
>>>>
>>>> Since we're talking business: git-scm.com still
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 al
Junio C Hamano venit, vidit, dixit 10.03.2015 03:03:
> Michael J Gruber writes:
>
>> Junio C Hamano venit, vidit, dixit 06.03.2015 20:03:
>>> Michael J Gruber writes:
>>>>
>>>> Note that now a checked branch is listed twice, once as target o
401 - 500 of 825 matches
Mail list logo
