On Saturday, July 7, 2018 3:02:35 PM MST Linus Torvalds wrote:
> From: Linus Torvalds
>
> This adds --date=human, which skips the timezone if it matches the
> current time-zone, and doesn't print the whole date if that matches (ie
> skip printing year for dates that are "this year", but also
On Wednesday, November 21, 2018 6:06:13 PM MST Junio C Hamano wrote:
> "Stephen P. Smith" writes:
> > On Wednesday, November 21, 2018 2:00:16 AM MST Junio C Hamano wrote:
> >> [Stalled]
> >>
> >> * lt/date-human (2018-07-09) 1 commit
> >>
On Wednesday, November 21, 2018 2:00:16 AM MST Junio C Hamano wrote:
> [Stalled]
>
> * lt/date-human (2018-07-09) 1 commit
> - Add 'human' date format
>
> A new date format "--date=human" that morphs its output depending
> on how far the time is from the current time has been introduced.
>
to
convey the current test contents for that switch.
[1] f50c9f76c ("Rename some test scripts and describe the naming convention",
2005-05-15)
Signed-off-by: Stephen P. Smith
---
t/{t7500-commit.sh => t7500-commit-template-squash-signoff.sh} | 2 +-
1 file changed, 1 insertion(+), 1 delet
Several tests did not comply with the documented test naming standard.
The patch series was held off until updates to t7501 was merged to the
master branch.
Stephen P. Smith (5):
t2000: rename and combine checkout clash tests
t7509: cleanup description and filename
t7502: rename commit
ntion",
2005-05-15)
Signed-off-by: Stephen P. Smith
---
t/t2000-checkout-cache-clash.sh | 60 -
t/t2000-conflict-when-checking-files-out.sh | 135
t/t2001-checkout-cache-clash.sh | 85
3 files changed, 135 insertions(+), 145
cribe the naming convention",
2005-05-15)
Signed-off-by: Stephen P. Smith
---
t/{t7509-commit.sh => t7509-commit-authorship.sh} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename t/{t7509-commit.sh => t7509-commit-authorship.sh} (98%)
diff --git a/t/t7509-commit.sh
, multiple message options, etc.
Rename the t7502-commit.sh to t7502-commit-porcelain.sh which reflects
the high level nature and usage of the options to commit.
[1] f50c9f76c ("Rename some test scripts and describe the naming convention",
2005-05-15)
Signed-off-by: Stephen P. Smith
---
some test scripts and describe the naming convention",
2005-05-15)
Signed-off-by: Stephen P. Smith
---
t/{t7501-commit.sh => t7501-commit-basic-funtionality.sh} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename t/{t7501-commit.sh => t7501-commit-basic-funtionality.sh} (100%)
ons were being called.
Based on a patch suggestion by Junio C Hamano. [1]
[1] https://public-inbox.org/git/xmqqr2i5ueg4@gitster-ct.c.googlers.com/
Signed-off-by: Stephen P. Smith
---
builtin/commit.c | 3 ++
wt-status.c | 134 +--
wt-sta
Junio suggested a cleanup patch, jc/wt-status-state-cleanup, which is
the basis for this patch.
This patch uses ss/wt-status-committable.
Update to fix a spelling error in the commet message
Stephen P. Smith (1):
roll wt_status_state into wt_status and populate in the collect phase
builtin
Junio suggested a cleanup patch, jc/wt-status-state-cleanup, which is
the basis for this patch.
This patch uses ss/wt-status-committable.
Updated commit comment and removed one extra blank line insertion.
Stephen P. Smith (1):
roll wt_status_state into wt_status and populate in the collect
ons were being called.
Based on a patch suggestion by Junio C Hamano. [1]
[1] https://public-inbox.org/git/xmqqr2i5ueg4@gitster-ct.c.googlers.com/
Signed-off-by: Stephen P. Smith
---
builtin/commit.c | 3 ++
wt-status.c | 134 +--
wt-sta
-ct.c.googlers.com/
Signed-off-by: Stephen P. Smith
---
builtin/commit.c | 3 ++
wt-status.c | 135 +--
wt-status.h | 38 ++---
3 files changed, 83 insertions(+), 93 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index
Junio suggested a cleanup patch, jc/wt-status-state-cleanup, which is
the basis for this patch.
This patch uses ss/wt-status-committable.
The main update from the patch suggestion was cleanup of the free
calls for three strings in the status structure.
Stephen P. Smith (1):
roll
On Friday, September 7, 2018 3:31:55 PM MST you wrote:
> Junio C Hamano writes:
> The patch is mostly for illustration of the idea.
>
> The result seems to compile and pass the test suite, but I haven't
> carefully thought about what else I may be breaking with this
> mechanical change. For
Fix variable spelling error.
Signed-off-by: Stephen P. Smith
---
builtin/commit.c | 18 +-
wt-status.c | 10 +-
wt-status.h | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 0d9828e29..51ecebbec
Add test for commit with --dry-run --short for a new file of zero
length.
The test demonstrates that the setting of the committable flag is
broken.
Signed-off-by: Stephen P. Smith
---
t/t7501-commit.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t7501-commit.sh b/t/t7501
Move has_unmerged up in the file so that has_unmerged can be called in
wt_status_collect where we need to place a merge check.
Signed-off-by: Stephen P. Smith
---
wt-status.c | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/wt-status.c b/wt
ommittable flag.
Change the tests to expect success since updates to the wt-status
broken code section is being fixed.
[1] https://public-inbox.org/git/xmqqr3gcj9i5@gitster.mtv.corp.google.com/
Signed-off-by: Stephen P. Smith
---
t/t7501-commit.sh | 6 +++---
wt-status.c | 13 ++
A couple of years ago, during a patch review Junio found that the
commitable bit as implemented in wt-status.c was broken.
Stephen P. Smith (4):
Move has_unmerged earlier in the file.
wt-status: rename commitable to committable
t7501: add test of "commit --dry-run --short"
w
A couple of years ago, during a patch review Junio found that the
commitable bit as implemented in wt-status.c was broken.
Stephen P. Smith (3):
Move has_unmerged earlier in the file.
Add test for commit --dry-run --short.
wt-status.c: Set the commitable flag in the collect phase.
t/t7501
Move has_unmerged up in the file so that has_unmerged can be called in
wt_status_collect where we need to place a merge check.
Signed-off-by: Stephen P. Smith
---
wt-status.c | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/wt-status.c b/wt
table flag.
Change the tests to expect success since updates to the wt-status
broken code section is being fixed.
[1] https://public-inbox.org/git/xmqqr3gcj9i5@gitster.mtv.corp.google.com/
Signed-off-by: Stephen P. Smith
---
t/t7501-commit.sh | 6 +++---
wt-status.c | 13 +++-
Add test for commit with --dry-run --short for a new file of zero
length.
The test demonstrates that the setting of the commitable flag is
broken.
Signed-off-by: Stephen P. Smith
---
t/t7501-commit.sh | 8
1 file changed, 8 insertions(+)
diff --git a/t/t7501-commit.sh b/t/t7501
t the flag in wt_status_collect_updated_cb.
Set the commitable flag in wt_status_collect_changes_initial to keep
from introducing a rebase regression.
Leave the setting of the commitable flag in show_merge_in_progress. If
a check for merged commits is moved to the collect phase then other
--dry-run tests fail.
Signed-off-by:
Two tests were written which showed failure cases when passing
--procelain or --short.
Change the test to expect success since updates to the wt-status
broken code section is being fixed.
Signed-off-by: Stephen P. Smith
---
t/t7501-commit.sh | 4 ++--
1 file changed, 2 insertions(+), 2
A couple of years ago, during a patch review Junio found that the
commitable bit as implemented in wt-status.c was broken.
Stephen P. Smith (3):
Change tests from expecting to fail to expecting success.
Add test for commit --dry-run --short.
wt-status.c: Set the commitable flag
Add test for commit with --dry-run --short for a new file of zero
length.
The test demonstrated that the setting of the commitable flag was
broken as was found durning an earlier patch review.
Signed-off-by: Stephen P. Smith
---
t/t7501-commit.sh | 10 ++
1 file changed, 10 insertions
The 'commit --dry-run' and 'commit' return values differed if a
conflicted merge had been resolved and the commit would be the same as
the parent.
Update show_merge_in_progress to set the commitable bit if conflicts
have been resolved and a merge is in progress.
Signed-off-by: Stephen P. Smith
The 'commit --dry-run' and commit return values differed if a
conflicted merge had been resolved and the commit would be the same as
the parent.
Update show_merge_in_progress to set the commitable bit if conflicts
have been resolved and a merge is in progress.
Signed-off-by: Stephen P. Smith
dditional modifiers in the future.
Signed-off-by: Will Palmer <wmpal...@gmail.com>
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Notes:
I agree that there may be commits that have an empty body which were made
with older git releases.
Even if the current git doe
Rework the section on gitweb to add information about the cgi script
and the instaweb command.
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Notes:
Removed wording duplication in the first paragraph.
Added explicit gitweb reference with regard to instaweb.
Fix
Rework the section on gitweb to add information about the cgi script
and the instaweb command.
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Documentation/user-manual.txt | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/Documentation/user-manual
Rather than merely pointing readers at the 1.5 release notes to
learn about shallow clones, document them formally.
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Notes:
Added a paragraph about the fundamental limitation with merging
histories that do not have a merg
There are several places in the documentation that
the term shallow clone is used. Defining the term
enables its use elsewhere with a known definition.
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Notes:
The review comments for the user guide update[1] suggested a
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Documentation/user-manual.txt | 23 ---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 1c790ac..ce347ff 100644
--- a/Documentatio
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Documentation/user-manual.txt | 23 ---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 1c790ac..15e97d3 100644
--- a/Documentatio
D,
except that would increase the learning curve early in the manual.
Detached HEADs are discussed a couple sections later under
"Examining an old version without creating a new branch".
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Documentation/user-manual.txt | 3 ---
Remove the suggestion for using a detached HEAD instead of a
temporary branch.
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Notes:
A search of the user manual found only one location which refers to
temporary branches. This has to do with how Tony Luck uses them.
Rather than merely pointing readers at the 1.5 release notes to
learn about shallow clones, document them formally.
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
I replaced the paragraphs that I wrote with Eric Shunshine's since it
was cleaner.
I like the idea of l
There are several places in the documentation that
the term shallow clone is used. Defining the term
enables its use elsewhere with a known definition.
---
Documentation/glossary-content.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/glossary-content.txt
Rather than merely pointing readers at the 1.5 release notes to
learn about shallow clones, document them formally.
---
Documentation/user-manual.txt | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt
Rather than merely pointing readers at the 1.5 release notes to
learn about shallow clones, document them formally.
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Documentation/user-manual.txt | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff
There are several places in the documentation that
the term shallow clone is used. Defining the term
enables its use elsewhere with a known definition.
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Documentation/glossary-content.txt | 4
1 file changed, 4 insertions(+)
diff
There are several places in the documentation that
the term shallow clone is used. Defining the term
enables its use elsewhere with a known definition.
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Documentation/glossary-content.txt | 4
1 file changed, 4 insertions(+)
diff
The todo section previously noted that documentation of shallow clones
was not in the manual and had references to the 1.5.0 release notes.
The patch adds a section to the manual and removes the entry in the
ToDo list.
Signed-off-by: Stephen P. Smith <isch...@cox.net>
---
Notes:
During the mail thread about Pull is mostly evil a user asked how
the first parent could become reversed.
This howto explains how the first parent can get reversed when viewed
by the project and then explains a method to keep the history correct.
Signed-off-by: Stephen P. Smith isch...@cox.net
During the mail thread about Pull is mostly evil a user asked how
the first parent could become reversed.
This howto explains how the first parent can get reversed when viewed
by the project and then explains a method to keep the history correct.
Signed-off-by: Stephen P. Smith isch...@cox.net
49 matches
Mail list logo
