Re: Getting first tag per branch for a commit

Junio C Hamano writes: > Orgad Shaneh writes: > >> What I'd like to have is a way to tell the first tag per branch (or >> per merge) that the commit appeared on. > >> I think that this can be done by filtering out tags that are connected >> to already listed

Re: [PATCH v6 4/6] convert: put the flags field before the flag itself for consistent style

Lars Schneider writes: > Suggested-by: Jeff King > Signed-off-by: Lars Schneider > --- > convert.c | 10 +- > 1 file changed, 5 insertions(+), 5 deletions(-) An obviously correct no-op. I do not particularly see the

Re: [PATCH v6 3/6] t0021: write "OUT" only on success

Lars Schneider writes: > "rot13-filter.pl" used to write "OUT " to the debug log even in case of > an abort or error. Fix this by writing "OUT " to the debug log only in > the successful case if output is actually written. Again, use of "Fix this" without clarifying

Re: [PATCH v6 2/6] t0021: make debug log file name configurable

Lars Schneider writes: > The "rot13-filter.pl" helper wrote its debug logs always to > "rot13-filter.log". > Make this configurable by defining the log file as first parameter of > "rot13-filter.pl". > > This is useful if "rot13-filter.pl" is configured multiple times

Re: [PATCH v6 1/6] t0021: keep filter log files on comparison

Lars Schneider writes: > The filter log files are modified on comparison. Write the modified log files > to temp files for comparison to fix this. The phrase "to fix this" implies that it is _wrong_ to modify after comparing it, but it is unclear _why_ you think is

Re: Getting first tag per branch for a commit

Orgad Shaneh writes: > What I'd like to have is a way to tell the first tag per branch (or > per merge) that the commit appeared on. > I think that this can be done by filtering out tags that are connected > to already listed tags by first-parent link. Yes. When one tag can

Re: [PATCH v4 5/5] stash: implement builtin stash

On 06/19, Joel Teichroeb wrote: > On Sun, Jun 11, 2017 at 2:27 PM, Thomas Gummerer wrote: > >> + > >> +int cmd_stash(int argc, const char **argv, const char *prefix) > >> +{ > >> + int result = 0; > >> + pid_t pid = getpid(); > >> + > >> + struct option options[]

[PATCH v6 4/6] convert: put the flags field before the flag itself for consistent style

Suggested-by: Jeff King Signed-off-by: Lars Schneider --- convert.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/convert.c b/convert.c index f1e168bc30..9907e3b9ba 100644 --- a/convert.c +++ b/convert.c @@ -597,12

[PATCH v6 1/6] t0021: keep filter log files on comparison

The filter log files are modified on comparison. Write the modified log files to temp files for comparison to fix this. This is useful for the subsequent patch 'convert: add "status=delayed" to filter process protocol'. Signed-off-by: Lars Schneider ---

[PATCH v6 6/6] convert: add "status=delayed" to filter process protocol

Some `clean` / `smudge` filters might require a significant amount of time to process a single blob (e.g. the Git LFS smudge filter might perform network requests). During this process the Git checkout operation is blocked and Git needs to wait until the filter is done to continue with the

[PATCH v6 5/6] convert: move multiple file filter error handling to separate function

Refactoring the filter error handling is useful for the subsequent patch 'convert: add "status=delayed" to filter process protocol'. In addition, replace the parentheses around the empty "if" block with a single semicolon to adhere to the Git style guide. Signed-off-by: Lars Schneider

[PATCH v6 0/6] convert: add "status=delayed" to filter process protocol

Hi, here is the 6th iteration of my "status delayed" topic. Patch 1 to 3 are minor t0021 test adjustments and haven't been changed since v3. Patch 4 is new and a minor style adjustment. Patch 5 is a minor "extract method" refactoring in convert.c with an additional minor style adjustment in this

[PATCH v6 2/6] t0021: make debug log file name configurable

The "rot13-filter.pl" helper wrote its debug logs always to "rot13-filter.log". Make this configurable by defining the log file as first parameter of "rot13-filter.pl". This is useful if "rot13-filter.pl" is configured multiple times similar to the subsequent patch 'convert: add "status=delayed"

[PATCH v6 3/6] t0021: write "OUT" only on success

"rot13-filter.pl" used to write "OUT " to the debug log even in case of an abort or error. Fix this by writing "OUT " to the debug log only in the successful case if output is actually written. This is useful for the subsequent patch 'convert: add "status=delayed" to filter process protocol'.

Hopefully

Dear friend, My name is Mr Micheal Rita, I am the Bill and Exchange (assistant) Manager of Bank of Africa Ouagadougou, Burkina Faso. In my department I discovered an abandoned sum of teen million five hundred thousand United State of American dollars (10.5MILLION USA DOLLARS) in an account that

Re: NULL dereference in ab/wildmatch

On Sun, Jun 25, 2017 at 4:09 PM, Jeff King wrote: > On Sun, Jun 25, 2017 at 02:50:10AM -0700, scan-ad...@coverity.com wrote: > >> >> ** CID 1413016: Null pointer dereferences (FORWARD_NULL) >> /config.c: 213 in include_by_gitdir() >> >> >>

NULL dereference in ab/wildmatch

On Sun, Jun 25, 2017 at 02:50:10AM -0700, scan-ad...@coverity.com wrote: > > ** CID 1413016: Null pointer dereferences (FORWARD_NULL) > /config.c: 213 in include_by_gitdir() > > > > ***

Getting first tag per branch for a commit

Hi, git describe --tags gives me the first tag that includes this commit. git tag --contains shows all the tags that contain the commit. git branch -a --contains shows the branches that include this commit. What I'd like to have is a way to tell the first tag per branch (or per merge) that

[PATCH] Spelling fixes

Signed-off-by: Ville Skyttä --- Documentation/RelNotes/1.7.10.1.txt | 2 +- Documentation/RelNotes/2.12.0.txt | 2 +- Documentation/RelNotes/2.14.0.txt | 2 +- Documentation/git-reset.txt | 2 +- Documentation/git-submodule.txt

Re: Migration from CVS to Git looses merges

Andreas Schwab writes: > Merges are recognized purely by matching the commit message, and the > regexp must capture the branch name in the first subexpr. The -m option > enables some default regexps but won't match your example. You can use > -M 'Merge branch ([-\w]+)'

Re: Migration from CVS to Git looses merges

On Jun 25 2017, Urs Thuermann wrote: > In both cases, the branch "a-branch" is in the git repository but is > not merged with the master branch, i.e. rev 1.4 has only parent 1.3 > but not 1.2.2.2. I also tried cvsimport with several regexes passed > using -M to match

Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()

Am 16.06.2017 um 21:43 schrieb Junio C Hamano: > Ævar Arnfjörð Bjarmason writes: > >> A follow-up to the existing "type" rule added in an earlier >> change. This catches some occurrences that are missed by the previous >> rule. >> >> Signed-off-by: Ævar Arnfjörð Bjarmason

Migration from CVS to Git looses merges

I want to convert several old CVS repositories to Git. Some of these CVS repositories contain branches, which have later been merged to the main trunk. When I try to convert using cvs2git or git cvsimport the branches appear in the new git repository but they are not merged to the master branch.