[PATCH v2 2/2] test_date.c: Remove reference to GIT_TEST_DATE_NOW

2019-09-11 Thread Stephen P. Smith
Remove the reference to the GIT_TEST_DATE_NOW which is done in date.c. We can't get rid of the "x" variable, since it serves as a generic scratch variable for parsing later in the function. Signed-off-by: Stephen P. Smith --- t/helper/test-date.c | 1 - 1 file changed, 1 deletion

[PATCH v2 1/2] Quit passing 'now' to date code

2019-09-11 Thread Stephen P. Smith
meter down through the date functions, since nobody uses them. Note that we do need to make sure all of the previous callers that took a "now" parameter are correctly using get_time(). Signed-off-by: Stephen P. Smith --- cache.h | 5 ++--- date.c | 27 ++

[PATCH v2 0/2] Date test code clean-up

2019-09-11 Thread Stephen P. Smith
c ## @@ t/helper/test-date.c: static void getnanos(const char **argv) Stephen P. Smith (2): Quit passing 'now' to date code test_date.c: Remove reference to GIT_TEST_DATE_NOW cache.h | 5 ++--- date.c | 27 +-- t/helper/

[PATCH 2/2] test_date.c: Remove reference to GIT_TEST_DATE_NOW

2019-09-08 Thread Stephen P. Smith
Remove the reference to the GIT_TEST_DATE_NOW which is done in date.c. The intialization of variable x with the value from GIT_TEST_DATE_NOW is unneeded since x is initalized by skip_prefix(). Signed-off-by: Stephen P. Smith --- t/helper/test-date.c | 1 - 1 file changed, 1 deletion(-) diff

[PATCH 1/2] Quit passing 'now' to date code

2019-09-08 Thread Stephen P. Smith
As part of a previous patch set, the get_time() function was added to date.c eliminating the need to pass a `now` parameter from the test code. Signed-off-by: Stephen P. Smith --- cache.h | 5 ++--- date.c | 27 +-- t/helper/test-date.c | 26

[PATCH 0/2] Date test code clean-up

2019-09-08 Thread Stephen P. Smith
patch. I did that to make the comment about the initialization of `x` more localized to the change. [1] https://public-inbox.org/git/xmqq5zuge2y7@gitster-ct.c.googlers.com Stephen P. Smith (2): Quit passing 'now' to date code test_date.c: Remove reference to GIT_TEST_DATE_NOW

[PATCH v4 5/5] Add `human` date format tests.

2019-01-28 Thread Stephen P. Smith
TEST_DATE_NOW environment variable when using the test-tool to hold the expected output strings constant. Signed-off-by: Stephen P. Smith --- t/t0006-date.sh | 18 ++ 1 file changed, 18 insertions(+) diff --git a/t/t0006-date.sh b/t/t0006-date.sh index 90930c2aa7..d9fcc829a9 100755

[PATCH v4 0/5] Re-roll of 'human' date format patch set

2019-01-28 Thread Stephen P. Smith
_date_format_human() { -+ t=$(($TEST_DATE_NOW - $1)) ++ t=$(($GIT_TEST_DATE_NOW - $1)) + echo "$t -> $2" >expect + test_expect_success "human date $t" ' -+ test-tool date human $t >actual && -+ test_cmp expect actual ++

[PATCH v4 4/5] Add `human` format to test-tool

2019-01-28 Thread Stephen P. Smith
by by gettimeofday(). All calls to gettimeofday() were replaced by calls to get_time(). Renamed occurances of TEST_DATE_NOW to GIT_TEST_DATE_NOW since the variable is now used in the get binary and not just in the test-tool. Signed-off-by: Stephen P. Smith --- cache.h | 2

[PATCH v4 3/5] Add 'human' date format documentation

2019-01-28 Thread Stephen P. Smith
7;relative' date format wasn't already implemented then using 'relative' would have been appropriate. Signed-off-by: Stephen P. Smith --- Documentation/git-log.txt | 4 Documentation/rev-list-options.txt | 7 +++ 2 files changed, 11 insertions(+) diff --git

[PATCH v4 1/5] Add 'human' date format

2019-01-28 Thread Stephen P. Smith
combine it with the "-local" suffix to never show timezones for an even more simplified view. Signed-off-by: Linus Torvalds Signed-off-by: Stephen P. Smith --- builtin/blame.c | 4 ++ cache.h | 1 + date.c | 130 3 f

[PATCH v4 2/5] Replace the proposed 'auto' mode with 'auto:'

2019-01-28 Thread Stephen P. Smith
x27; if the pager is being used by using auto:foo syntax. Therefore, 'auto:human' date mode defaults to human if we're using the pager. So you can do git config --add log.date auto:human and your "git log" commands will show the human-legible format unless you&#

Re: [PATCH v2 4/5] Add `human` format to test-tool

2019-01-20 Thread Stephen P. Smith
On Friday, January 18, 2019 12:03:40 PM MST Junio C Hamano wrote: > It is a shame that you introduced a nicely reusable get_time() > mechanism to let external callers of show_date() specify what time > to format, instead of the returned timestamp of gettimeofday(), > but limited its usefulness to o

[PATCH v3 1/5] Add 'human' date format

2019-01-20 Thread Stephen P. Smith
combine it with the "-local" suffix to never show timezones for an even more simplified view. Signed-off-by: Linus Torvalds Signed-off-by: Stephen P. Smith --- builtin/blame.c | 4 ++ cache.h | 1 + date.c | 130 3 f

[PATCH v3 0/5] Re-roll of 'human' date format patch set

2019-01-20 Thread Stephen P. Smith
Reworked documentation and tests for the previously submitted patch set. Linus Torvalds (1): Add 'human' date format Stephen P. Smith (4): Replace the proposed 'auto' mode with 'auto:' Add 'human' date format documentation Add `human` format to t

[PATCH v3 5/5] Add `human` date format tests.

2019-01-20 Thread Stephen P. Smith
TEST_DATE_NOW environment variable when using the test-tool to hold the expected output strings constant. Signed-off-by: Stephen P. Smith --- t/t0006-date.sh | 18 ++ 1 file changed, 18 insertions(+) diff --git a/t/t0006-date.sh b/t/t0006-date.sh index ffb2975e48..35f7b52dd7 100755

[PATCH v3 4/5] Add `human` format to test-tool

2019-01-20 Thread Stephen P. Smith
gettimeofday(). All calls to gettimeofday() were replaced by calls to get_time(). Signed-off-by: Stephen P. Smith --- cache.h | 2 ++ date.c | 21 + t/helper/test-date.c | 11 +++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a

[PATCH v3 4/5] Add `human` format to test-tool

2019-01-20 Thread Stephen P. Smith
gettimeofday(). All calls to gettimeofday() were replaced by calls to get_time(). Signed-off-by: Stephen P. Smith --- cache.h | 2 ++ date.c | 21 + t/helper/test-date.c | 11 +++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a

[PATCH v3 3/5] Add 'human' date format documentation

2019-01-20 Thread Stephen P. Smith
7;relative' date format wasn't already implemented then using 'relative' would have been appropriate. Signed-off-by: Stephen P. Smith --- Documentation/git-log.txt | 4 Documentation/rev-list-options.txt | 7 +++ 2 files changed, 11 insertions(+) diff --git

[PATCH v3 3/5] Add 'human' date format documentation

2019-01-20 Thread Stephen P. Smith
7;relative' date format wasn't already implemented then using 'relative' would have been appropriate. Signed-off-by: Stephen P. Smith --- Documentation/git-log.txt | 4 Documentation/rev-list-options.txt | 7 +++ 2 files changed, 11 insertions(+) diff --git

[PATCH v3 0/5] Re-roll of 'human' date format patch set

2019-01-20 Thread Stephen P. Smith
Reworked documentation and tests for the previously submitted patch set. Linus Torvalds (1): Add 'human' date format Stephen P. Smith (4): Replace the proposed 'auto' mode with 'auto:' Add 'human' date format documentation Add `human` format to t

[PATCH v3 2/5] Replace the proposed 'auto' mode with 'auto:'

2019-01-20 Thread Stephen P. Smith
x27; if the pager is being used by using auto:foo syntax. Therefore, 'auto:human' date mode defaults to human if we're using the pager. So you can do git config --add log.date auto:human and your "git log" commands will show the human-legible format unless you&#

[PATCH v3 5/5] Add `human` date format tests.

2019-01-20 Thread Stephen P. Smith
TEST_DATE_NOW environment variable when using the test-tool to hold the expected output strings constant. Signed-off-by: Stephen P. Smith --- t/t0006-date.sh | 18 ++ 1 file changed, 18 insertions(+) diff --git a/t/t0006-date.sh b/t/t0006-date.sh index ffb2975e48..35f7b52dd7 100755

[PATCH v3 2/5] Replace the proposed 'auto' mode with 'auto:'

2019-01-20 Thread Stephen P. Smith
x27; if the pager is being used by using auto:foo syntax. Therefore, 'auto:human' date mode defaults to human if we're using the pager. So you can do git config --add log.date auto:human and your "git log" commands will show the human-legible format unless you&#

[PATCH v3 1/5] Add 'human' date format

2019-01-20 Thread Stephen P. Smith
combine it with the "-local" suffix to never show timezones for an even more simplified view. Signed-off-by: Linus Torvalds Signed-off-by: Stephen P. Smith --- builtin/blame.c | 4 ++ cache.h | 1 + date.c | 130 3 f

[PATCH v2 4/5] Add `human` format to test-tool

2019-01-17 Thread Stephen P. Smith
pass the time value. Signed-off-by: Stephen P. Smith --- cache.h | 2 ++ date.c | 26 -- t/helper/test-date.c | 15 +++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/cache.h b/cache.h index 34c33e6a28..fe00ddf910

[PATCH v2 3/5] Add 'human' date format documentation

2019-01-17 Thread Stephen P. Smith
7;relative' date format wasn't already implemented then using 'relative' would have been appropriate. Signed-off-by: Stephen P. Smith --- Documentation/git-log.txt | 4 Documentation/rev-list-options.txt | 6 ++ 2 files changed, 10 insertions(+) diff --git

[PATCH v2 0/5] Re-roll of 'human' date format patch set

2019-01-17 Thread Stephen P. Smith
Reworked documentation and tests for the previously submitted patch set. Linus Torvalds (1): Add 'human' date format Stephen P. Smith (4): Remove the proposed use of auto as secondary way to specify human Add 'human' date format documentation Add `human` forma

[PATCH v2 5/5] Add `human` date format tests.

2019-01-17 Thread Stephen P. Smith
TEST_DATE_NOW environment variable when using the test-tool to hold the expected output strings constant. Signed-off-by: Stephen P. Smith --- t/t0006-date.sh | 20 1 file changed, 20 insertions(+) diff --git a/t/t0006-date.sh b/t/t0006-date.sh index ffb2975e48..c7c0786b24 100755

[PATCH v2 2/5] Remove the proposed use of auto as secondary way to specify human

2019-01-17 Thread Stephen P. Smith
ich defaults to human if we're using the pager. So you can do git config --add log.date auto:human and your "git log" commands will show the human-legible format unless you're scripting things. Signed-off-by: Stephen P. Smith --- date.c | 15 --- 1

[PATCH v2 1/5] Add 'human' date format

2019-01-17 Thread Stephen P. Smith
combine it with the "-local" suffix to never show timezones for an even more simplified view. Signed-off-by: Linus Torvalds Signed-off-by: Stephen P. Smith --- builtin/blame.c | 4 ++ cache.h | 1 + date.c | 130 3 f

Re: [PATCH 3/3] t0006-date.sh: add `human` date format tests.

2019-01-08 Thread Stephen P. Smith
On Tuesday, January 8, 2019 2:27:22 PM MST Johannes Sixt wrote: > Am 31.12.18 um 01:31 schrieb Stephen P. Smith: > > + > > +TODAY_REGEX='[A-Z][a-z][a-z] [012][0-9]:[0-6][0-9] .0200' > The $...REGEX expansions must be put in double-quotes to protect them > from fiel

Re: [PATCH 1/3] Add 'human' date format

2019-01-04 Thread Stephen P Smith
On Friday, January 4, 2019 12:50:35 AM MST Jeff King wrote: > On Thu, Jan 03, 2019 at 06:19:56AM -0700, Stephen P. Smith wrote: > > > > I didn't see anything in the code which would prohibit setting something > > like that. > > Yeah, I don't think suppor

Re: [PATCH 3/3] t0006-date.sh: add `human` date format tests.

2019-01-03 Thread Stephen P. Smith
On Thursday, January 3, 2019 2:45:39 PM MST Junio C Hamano wrote: > Philip Oakley writes: > >> > >>check_human_date 432000 "$THIS_YEAR_REGEX" # 5 days ago > > > > Just a quick bikeshed: if used, would this have a year end 5 day > > roll-over error potential, or will it always use the single

Re: [PATCH 3/3] t0006-date.sh: add `human` date format tests.

2019-01-03 Thread Stephen P. Smith
On Wednesday, January 2, 2019 11:42:20 PM MST Junio C Hamano wrote: > > Are you suggesting that t4202-log.sh not be updated and that only and > > t7007- show.sh and t0006-date.sh updated? > > I am saying that using "log -1" and "show" in different tests _only_ > for the value of "Date:" field doe

Re: [PATCH 1/3] Add 'human' date format

2019-01-03 Thread Stephen P. Smith
On Thursday, January 3, 2019 12:37:35 AM MST Jeff King wrote: > I like the idea of "human", and I like the idea of "auto", but it seems > to me that these are really two orthogonal things. E.g., might some > people not want to do something like: > > git config log.date auto:relative I didn't see

[PATCH 2/3] Add 'human' date format documentation

2018-12-30 Thread Stephen P. Smith
7;relative' date format wasn't already implemented then using 'relative' would have been appropriate. Signed-off-by: Stephen P. Smith --- Documentation/rev-list-options.txt | 8 1 file changed, 8 insertions(+) diff --git a/Documentation/rev-list-options.txt b/Documentat

[PATCH 1/3] Add 'human' date format

2018-12-30 Thread Stephen P. Smith
combine it with the "-local" suffix to never show timezones for an even more simplified view. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano Signed-off-by: Stephen P. Smith --- builtin/blame.c | 4 ++ cache.h | 1 + date.c | 130 ++

[PATCH 3/3] t0006-date.sh: add `human` date format tests.

2018-12-30 Thread Stephen P. Smith
local computer date. In cases where the difference is less than a year, the year field is supppressed. If the time is less than a day; the month and year is suppressed. Test using a regular expression to verify that fields that are expected to be suppressed are not displayed. Signed-off-by: Stephen P

[PATCH 0/3] Add 'human' date format

2018-12-30 Thread Stephen P. Smith
7;human' date format Stephen P. Smith (2): Add 'human' date format documentation t0006-date.sh: add `human` date format tests. Documentation/rev-list-options.txt | 8 ++ builtin/blame.c| 4 + cache.h| 1 + date.

Re: Git hooks don't run while commiting in worktree via git-gui

2018-12-19 Thread Stephen P. Smith
On Tuesday, December 18, 2018 2:56:43 PM MST Johannes Schindelin wrote: > Sounds like you need https://github.com/git-for-windows/git/pull/1757 > (we do not currently have a responsive maintainer for Git GUI, > unfortunately, otherwise this patch would have made it into an official > Git version al

Re: [RFC PATCH v2] Add 'human' date format

2018-11-26 Thread Stephen P. Smith
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 skip

Re: What's cooking in git.git (Nov 2018, #06; Wed, 21)

2018-11-21 Thread Stephen P. Smith
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 > >>

Re: What's cooking in git.git (Nov 2018, #06; Wed, 21)

2018-11-21 Thread Stephen P. Smith
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. > "-

[PATCH 4/5] t7500: rename commit tests script to comply with naming convention

2018-10-22 Thread Stephen P. Smith
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

[PATCH 0/5] Commit test name clean-up

2018-10-22 Thread Stephen P. Smith
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

[PATCH 1/5] t2000: rename and combine checkout clash tests

2018-10-22 Thread Stephen P. Smith
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

[PATCH 2/5] t7509: cleanup description and filename

2018-10-22 Thread Stephen P. Smith
e 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

[PATCH 3/5] t7502: rename commit test script to comply with naming convention

2018-10-22 Thread Stephen P. Smith
n-off, 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

[PATCH 5/5] t7501: rename commit test to comply with naming convention

2018-10-22 Thread 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%)

[PATCH v3 1/1] roll wt_status_state into wt_status and populate in the collect phase

2018-09-30 Thread Stephen P. Smith
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

[PATCH v3 0/1] wt-status-state-cleanup

2018-09-30 Thread Stephen P. Smith
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

[PATCH v2 0/1] wt-status-state-cleanup

2018-09-29 Thread Stephen P. Smith
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

[PATCH v2 1/1] roll wt_status_state into wt_status and populate in the collect phase

2018-09-29 Thread Stephen P. Smith
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

[PATCH 0/1] wt-status-state-cleanup

2018-09-27 Thread Stephen P. Smith
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

[PATCH 1/1] roll wt_status_state into wt_status and populate in the collect phase

2018-09-27 Thread Stephen P. Smith
-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

Re: [PATCH v3 4/4] wt-status.c: Set the committable flag in the collect phase.

2018-09-07 Thread Stephen P. Smith
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 exa

[PATCH v3 2/4] wt-status: rename commitable to committable

2018-09-05 Thread Stephen P. Smith
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

[PATCH v3 3/4] t7501: add test of "commit --dry-run --short"

2018-09-05 Thread Stephen P. Smith
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

[PATCH v3 1/4] Move has_unmerged earlier in the file.

2018-09-05 Thread Stephen P. Smith
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

[PATCH v3 4/4] wt-status.c: Set the committable flag in the collect phase.

2018-09-05 Thread Stephen P. Smith
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 ++

[PATCH v3 0/4] wt-status.c: commitable flag

2018-09-05 Thread Stephen P. Smith
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

[PATCH v2 3/3] wt-status.c: Set the commitable flag in the collect phase.

2018-09-01 Thread Stephen P. Smith
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 +++-

[PATCH v2 0/3] wt-status.c: commitable flag

2018-09-01 Thread Stephen P. Smith
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

[PATCH v2 1/3] wt-status.c: Move has_unmerged earlier in the file.

2018-09-01 Thread Stephen P. Smith
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

[PATCH v2 2/3] Add test for commit --dry-run --short.

2018-09-01 Thread Stephen P. Smith
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

[PATCH 3/3] wt-status.c: Set the commitable flag in the collect phase.

2018-08-30 Thread Stephen P. Smith
he 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:

[PATCH 1/3] Change tests from expecting to fail to expecting success.

2018-08-30 Thread Stephen P. Smith
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

[PATCH 0/3] wt-status.c: commitable flag

2018-08-30 Thread Stephen P. Smith
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 in the

[PATCH 2/3] Add test for commit --dry-run --short.

2018-08-30 Thread Stephen P. Smith
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

[PATCH v2] wt-status.c: set commitable bit if there is a meaningful merge.

2016-02-16 Thread 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-

[PATCH] wt-status.c: set commitable bit if there is a meaningful merge.

2016-02-15 Thread 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: Stephe

[PATCH V5 2/2] object name: introduce '^{/!-}' notation

2016-01-30 Thread Stephen P. Smith
fiers in the future. Signed-off-by: Will Palmer Signed-off-by: Stephen P. Smith --- 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 does check for empty bodied commits (by default), the

[PATCH V2] user-manual: add addition gitweb information

2015-12-30 Thread Stephen P. Smith
Rework the section on gitweb to add information about the cgi script and the instaweb command. Signed-off-by: Stephen P. Smith --- Notes: Removed wording duplication in the first paragraph. Added explicit gitweb reference with regard to instaweb. Fixed two spelling errors

[PATCH] user-manual: add addition gitweb information

2015-12-30 Thread Stephen P. Smith
Rework the section on gitweb to add information about the cgi script and the instaweb command. Signed-off-by: Stephen P. Smith --- Documentation/user-manual.txt | 16 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation

[PATCH V7 2/2] user-manual: add section documenting shallow clones

2015-12-29 Thread Stephen P. Smith
Signed-off-by: Stephen P. Smith --- 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/Documentation/user-manual.txt +++ b

[PATCH V6 2/2] user-manual: add section documenting shallow clones

2015-12-29 Thread Stephen P. Smith
Signed-off-by: Stephen P. Smith --- 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/Documentation/user-manual.txt +++ b

[PATCH V5 2/2] user-manual: add section documenting shallow clones

2015-12-29 Thread Stephen P. Smith
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 --- Notes: Added a paragraph about the fundamental limitation with merging histories that do not have a merge base in the shallow

[PATCH V4 1/2] glossary: define the term shallow clone

2015-12-29 Thread Stephen P. Smith
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 --- Notes: The review comments for the user guide update[1] suggested a change in the definition of a

[PATCH V2] user-manual: remove temporary branch entry from todo list

2015-12-28 Thread Stephen P. Smith
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 --- Documentation/user-manual.txt | 3 --- 1 file changed

[PATCH] user-manual: remove temporary branch entry from todo list

2015-12-23 Thread Stephen P. Smith
Remove the suggestion for using a detached HEAD instead of a temporary branch. Signed-off-by: Stephen P. Smith --- 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. Even then there is a

[PATCH V4 2/2] user-manual: add section documenting shallow clones

2015-12-23 Thread Stephen P. Smith
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 --- I replaced the paragraphs that I wrote with Eric Shunshine's since it was cleaner. I like the idea of linking to the preceeding effort

[PATCH V3 2/2] user-manual: add section documenting shallow clones

2015-12-22 Thread Stephen P. Smith
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 --- Documentation/user-manual.txt | 21 ++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Documentation/user

[PATCH V3 1/2] glossary: define the term shallow clone

2015-12-22 Thread Stephen P. Smith
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 --- Documentation/glossary-content.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation

[PATCH V2 2/2] user-manual: add section documenting shallow clones

2015-12-22 Thread Stephen P. Smith
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 b/Documentation/user-manual

[PATCH V2 1/2] glossary: define the term shallow clone

2015-12-22 Thread Stephen P. Smith
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 b/Documentation

[PATCH 1/2] Define the term shallow clone.

2015-12-21 Thread Stephen P. Smith
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 --- Documentation/glossary-content.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation

[PATCH 2/2] Add a section to the users manual documenting shallow clones.

2015-12-21 Thread Stephen P. Smith
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 --- Notes: I considered adding a

[PATCH] How to keep a project's canonical history correct.

2014-05-08 Thread Stephen P. Smith
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: Stephe

How to keep a project's canonical history correct.

2014-05-07 Thread Stephen P. Smith
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: Stephe