Skip to content

Improve gitdir handling with submodules - #135

Merged
ktoso merged 2 commits into
git-commit-id:masterfrom
maiergre:master
Nov 9, 2014
Merged

Improve gitdir handling with submodules#135
ktoso merged 2 commits into
git-commit-id:masterfrom
maiergre:master

Conversation

@maiergre

@maiergremaiergre commented Oct 30, 2014

Copy link
Copy Markdown
Contributor

Thanks for the plugin!

This pull req fixes two issues I encountered:

  • When using git submodules some older git version (e.g., 1.7.9, used by Ubuntu 12.04 LTS) use absolute path in the .git gitdir reference. I've added support for absolute path.
  • When searching for the gitdir the plugin should search the parent directory not the parent project. Esp. with submodules searching the parent project is not correct since the parent might be in a different git repo.

@maiergre
Support absoulte path in git submodule gitdirs
876490b
When using git submodules, some versions of git (e.g., 1.7.9) use
abosulate path in the gitdir reference of the submodules. This patch
adds support to handle absoluate path correctly.
@maiergre
Use parent directory not parent project to locate gitdir
fe371c5
When searching for the git directory of a project the search follows
the project's basedir parent directory rather than following the
project hierarchy (which is not correct)
@maiergre

maiergre commented Oct 30, 2014

Copy link
Copy Markdown
ContributorAuthor

FYI, the second point is similar to #128 however #128 doesn't work for submodules

@maiergre

maiergre commented Nov 7, 2014

Copy link
Copy Markdown
ContributorAuthor

@ktoso I was wondering whether you had a chance to look at this pull request

@ktoso

ktoso commented Nov 7, 2014

Copy link
Copy Markdown
Collaborator

Sorry, not yet, was very busy with Akka this week. But should be able to
look tomorrow :-)

Thanks for your patience!

Konrad
(sent from mobile)
On 7 Nov 2014 19:20, "Gregor Maier" notifications@github.com wrote:

@ktosohttps://github.com/ktoso I was wondering whether you had a
chance to look at this pull request

—
Reply to this email directly or view it on GitHub
#135 (comment)
.

ktoso
ktoso reviewed Nov 8, 2014
View reviewed changes
Comment threadsrc/main/java/pl/project13/maven/git/GitDirLocator.java

@ktosoktosoNov 8, 2014

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gitdir is always != null here

@ktoso

ktoso commented Nov 9, 2014

Copy link
Copy Markdown
Collaborator

Seems good to me, and tests pass. Unless I missed some edge case this should be fine - thanks for the contribution!

ktoso added a commit that referenced this pull request Nov 9, 2014
@ktoso
Merge pull request#135from maiergre/master
77679ab
Improve gitdir handling with submodules
@ktoso
ktoso merged commit 77679ab into git-commit-id:masterNov 9, 2014
@ktosoktoso added this to the 2.1.12 milestone Dec 8, 2014
@klion26

klion26 commented Aug 31, 2024

Copy link
Copy Markdown

Hi thanks for the great project, so that we can track the commit message in the distribute env easily.

I have a question about searching for .git in the parent directory: do we need to add an option to not search the parent directory when finding the .git dir? I am not sure if this is a normal case or not, I encountered this in some testing processes. thanks.

Now we will search all parent directories from the current directory to find the .git directory, but when I configure failOnNoGitDirectory to true and there is a .git directory in a parent directory, the compilation will not report an error and fail, but the .git directory founded in the parent directory will be used as the information of the project.

The background of this case is that I am contributing to an open-source project. this project wants to report an error without .git under the usual process, but the project also provides a zip package download method to compile without .git. When I tested it, I moved the .git directory to the parent directory of the project and found it passed the compilation and did not report any error.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.1.12

Development

Successfully merging this pull request may close these issues.

3 participants

@maiergre@ktoso@klion26
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Improve gitdir handling with submodules by maiergre · Pull Request #135 · git-commit-id/git-commit-id-maven-plugin · GitHub
Skip to content
Improve gitdir handling with submodules - #135
Merged
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Nov 9, 2014
Merged
Improve gitdir handling with submodules#135
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Conversation
@maiergre
@maiergremaiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

Contributor
Thanks for the plugin!
This pull req fixes two issues I encountered:
  • When using git submodules some older git version (e.g., 1.7.9, used by Ubuntu 12.04 LTS) use absolute path in the .git gitdir reference. I've added support for absolute path.
  • When searching for the gitdir the plugin should search the parent directory not the parent project. Esp. with submodules searching the parent project is not correct since the parent might be in a different git repo.
@maiergre
Support absoulte path in git submodule gitdirs
876490b
When using git submodules, some versions of git (e.g., 1.7.9) use
abosulate path in the gitdir reference of the submodules. This patch
adds support to handle absoluate path correctly.
@maiergre
Use parent directory not parent project to locate gitdir
fe371c5
When searching for the git directory of a project the search follows
the project's basedir parent directory rather than following the
project hierarchy (which is not correct)
@maiergre
maiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

ContributorAuthor
FYI, the second point is similar to #128 however #128 doesn't work for submodules
@maiergre
maiergre
commented
Nov 7, 2014

Copy link


Copy Markdown

ContributorAuthor
@ktoso I was wondering whether you had a chance to look at this pull request
@ktoso
ktoso
commented
Nov 7, 2014

Copy link


Copy Markdown

Collaborator
Sorry, not yet, was very busy with Akka this week. But should be able to

look tomorrow :-)
Thanks for your patience!
Konrad

(sent from mobile)

On 7 Nov 2014 19:20, "Gregor Maier" notifications@github.com wrote:
@ktosohttps://github.com/ktoso I was wondering whether you had a

chance to look at this pull request
—

Reply to this email directly or view it on GitHub
#135 (comment)

.
ktoso
ktoso
reviewed
Nov 8, 2014
 View reviewed changes

Comment threadsrc/main/java/pl/project13/maven/git/GitDirLocator.java
@ktosoktosoNov 8, 2014

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gitdir is always != null here
@ktoso
ktoso
commented
Nov 9, 2014

Copy link


Copy Markdown

Collaborator
Seems good to me, and tests pass. Unless I missed some edge case this should be fine - thanks for the contribution!
ktoso added a commit
that referenced
this pull request
Nov 9, 2014
@ktoso
Merge pull request#135from maiergre/master
77679ab
Improve gitdir handling with submodules
@ktoso
ktoso
merged commit 77679ab
into
git-commit-id:masterNov 9, 2014
@ktosoktoso
added this to the 2.1.12 milestone
Dec 8, 2014
@klion26
klion26
commented
Aug 31, 2024

Copy link


Copy Markdown

Hi thanks for the great project, so that we can track the commit message in the distribute env easily.
I have a question about searching for .git in the parent directory: do we need to add an option to not search the parent directory when finding the .git dir? I am not sure if this is a normal case or not, I encountered this in some testing processes. thanks.
Now we will search all parent directories from the current directory to find the .git directory, but when I configure failOnNoGitDirectory to true and there is a .git directory in a parent directory, the compilation will not report an error and fail, but the .git directory founded in the parent directory will be used as the information of the project.
The background of this case is that I am contributing to an open-source project. this project wants to report an error without .git under the usual process, but the project also provides a zip package download method to compile without .git. When I tested it, I moved the .git directory to the parent directory of the project and found it passed the compilation and did not report any error.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

2.1.12

Development

Successfully merging this pull request may close these issues.

3 participants

@maiergre@ktoso@klion26

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Improve gitdir handling with submodules by maiergre · Pull Request #135 · git-commit-id/git-commit-id-maven-plugin · GitHub
Skip to content
Improve gitdir handling with submodules - #135
Merged
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Nov 9, 2014
Merged
Improve gitdir handling with submodules#135
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Conversation
@maiergre
@maiergremaiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

Contributor
Thanks for the plugin!
This pull req fixes two issues I encountered:
  • When using git submodules some older git version (e.g., 1.7.9, used by Ubuntu 12.04 LTS) use absolute path in the .git gitdir reference. I've added support for absolute path.
  • When searching for the gitdir the plugin should search the parent directory not the parent project. Esp. with submodules searching the parent project is not correct since the parent might be in a different git repo.
@maiergre
Support absoulte path in git submodule gitdirs
876490b
When using git submodules, some versions of git (e.g., 1.7.9) use
abosulate path in the gitdir reference of the submodules. This patch
adds support to handle absoluate path correctly.
@maiergre
Use parent directory not parent project to locate gitdir
fe371c5
When searching for the git directory of a project the search follows
the project's basedir parent directory rather than following the
project hierarchy (which is not correct)
@maiergre
maiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

ContributorAuthor
FYI, the second point is similar to #128 however #128 doesn't work for submodules
@maiergre
maiergre
commented
Nov 7, 2014

Copy link


Copy Markdown

ContributorAuthor
@ktoso I was wondering whether you had a chance to look at this pull request
@ktoso
ktoso
commented
Nov 7, 2014

Copy link


Copy Markdown

Collaborator
Sorry, not yet, was very busy with Akka this week. But should be able to

look tomorrow :-)
Thanks for your patience!
Konrad

(sent from mobile)

On 7 Nov 2014 19:20, "Gregor Maier" notifications@github.com wrote:
@ktosohttps://github.com/ktoso I was wondering whether you had a

chance to look at this pull request
—

Reply to this email directly or view it on GitHub
#135 (comment)

.
ktoso
ktoso
reviewed
Nov 8, 2014
 View reviewed changes

Comment threadsrc/main/java/pl/project13/maven/git/GitDirLocator.java
@ktosoktosoNov 8, 2014

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gitdir is always != null here
@ktoso
ktoso
commented
Nov 9, 2014

Copy link


Copy Markdown

Collaborator
Seems good to me, and tests pass. Unless I missed some edge case this should be fine - thanks for the contribution!
ktoso added a commit
that referenced
this pull request
Nov 9, 2014
@ktoso
Merge pull request#135from maiergre/master
77679ab
Improve gitdir handling with submodules
@ktoso
ktoso
merged commit 77679ab
into
git-commit-id:masterNov 9, 2014
@ktosoktoso
added this to the 2.1.12 milestone
Dec 8, 2014
@klion26
klion26
commented
Aug 31, 2024

Copy link


Copy Markdown

Hi thanks for the great project, so that we can track the commit message in the distribute env easily.
I have a question about searching for .git in the parent directory: do we need to add an option to not search the parent directory when finding the .git dir? I am not sure if this is a normal case or not, I encountered this in some testing processes. thanks.
Now we will search all parent directories from the current directory to find the .git directory, but when I configure failOnNoGitDirectory to true and there is a .git directory in a parent directory, the compilation will not report an error and fail, but the .git directory founded in the parent directory will be used as the information of the project.
The background of this case is that I am contributing to an open-source project. this project wants to report an error without .git under the usual process, but the project also provides a zip package download method to compile without .git. When I tested it, I moved the .git directory to the parent directory of the project and found it passed the compilation and did not report any error.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

2.1.12

Development

Successfully merging this pull request may close these issues.

3 participants

@maiergre@ktoso@klion26

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Improve gitdir handling with submodules by maiergre · Pull Request #135 · git-commit-id/git-commit-id-maven-plugin · GitHub
Skip to content
Improve gitdir handling with submodules - #135
Merged
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Nov 9, 2014
Merged
Improve gitdir handling with submodules#135
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Conversation
@maiergre
@maiergremaiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

Contributor
Thanks for the plugin!
This pull req fixes two issues I encountered:
  • When using git submodules some older git version (e.g., 1.7.9, used by Ubuntu 12.04 LTS) use absolute path in the .git gitdir reference. I've added support for absolute path.
  • When searching for the gitdir the plugin should search the parent directory not the parent project. Esp. with submodules searching the parent project is not correct since the parent might be in a different git repo.
@maiergre
Support absoulte path in git submodule gitdirs
876490b
When using git submodules, some versions of git (e.g., 1.7.9) use
abosulate path in the gitdir reference of the submodules. This patch
adds support to handle absoluate path correctly.
@maiergre
Use parent directory not parent project to locate gitdir
fe371c5
When searching for the git directory of a project the search follows
the project's basedir parent directory rather than following the
project hierarchy (which is not correct)
@maiergre
maiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

ContributorAuthor
FYI, the second point is similar to #128 however #128 doesn't work for submodules
@maiergre
maiergre
commented
Nov 7, 2014

Copy link


Copy Markdown

ContributorAuthor
@ktoso I was wondering whether you had a chance to look at this pull request
@ktoso
ktoso
commented
Nov 7, 2014

Copy link


Copy Markdown

Collaborator
Sorry, not yet, was very busy with Akka this week. But should be able to

look tomorrow :-)
Thanks for your patience!
Konrad

(sent from mobile)

On 7 Nov 2014 19:20, "Gregor Maier" notifications@github.com wrote:
@ktosohttps://github.com/ktoso I was wondering whether you had a

chance to look at this pull request
—

Reply to this email directly or view it on GitHub
#135 (comment)

.
ktoso
ktoso
reviewed
Nov 8, 2014
 View reviewed changes

Comment threadsrc/main/java/pl/project13/maven/git/GitDirLocator.java
@ktosoktosoNov 8, 2014

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gitdir is always != null here
@ktoso
ktoso
commented
Nov 9, 2014

Copy link


Copy Markdown

Collaborator
Seems good to me, and tests pass. Unless I missed some edge case this should be fine - thanks for the contribution!
ktoso added a commit
that referenced
this pull request
Nov 9, 2014
@ktoso
Merge pull request#135from maiergre/master
77679ab
Improve gitdir handling with submodules
@ktoso
ktoso
merged commit 77679ab
into
git-commit-id:masterNov 9, 2014
@ktosoktoso
added this to the 2.1.12 milestone
Dec 8, 2014
@klion26
klion26
commented
Aug 31, 2024

Copy link


Copy Markdown

Hi thanks for the great project, so that we can track the commit message in the distribute env easily.
I have a question about searching for .git in the parent directory: do we need to add an option to not search the parent directory when finding the .git dir? I am not sure if this is a normal case or not, I encountered this in some testing processes. thanks.
Now we will search all parent directories from the current directory to find the .git directory, but when I configure failOnNoGitDirectory to true and there is a .git directory in a parent directory, the compilation will not report an error and fail, but the .git directory founded in the parent directory will be used as the information of the project.
The background of this case is that I am contributing to an open-source project. this project wants to report an error without .git under the usual process, but the project also provides a zip package download method to compile without .git. When I tested it, I moved the .git directory to the parent directory of the project and found it passed the compilation and did not report any error.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

2.1.12

Development

Successfully merging this pull request may close these issues.

3 participants

@maiergre@ktoso@klion26

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Improve gitdir handling with submodules by maiergre · Pull Request #135 · git-commit-id/git-commit-id-maven-plugin · GitHub
Skip to content
Improve gitdir handling with submodules - #135
Merged
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Nov 9, 2014
Merged
Improve gitdir handling with submodules#135
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Conversation
@maiergre
@maiergremaiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

Contributor
Thanks for the plugin!
This pull req fixes two issues I encountered:
  • When using git submodules some older git version (e.g., 1.7.9, used by Ubuntu 12.04 LTS) use absolute path in the .git gitdir reference. I've added support for absolute path.
  • When searching for the gitdir the plugin should search the parent directory not the parent project. Esp. with submodules searching the parent project is not correct since the parent might be in a different git repo.
@maiergre
Support absoulte path in git submodule gitdirs
876490b
When using git submodules, some versions of git (e.g., 1.7.9) use
abosulate path in the gitdir reference of the submodules. This patch
adds support to handle absoluate path correctly.
@maiergre
Use parent directory not parent project to locate gitdir
fe371c5
When searching for the git directory of a project the search follows
the project's basedir parent directory rather than following the
project hierarchy (which is not correct)
@maiergre
maiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

ContributorAuthor
FYI, the second point is similar to #128 however #128 doesn't work for submodules
@maiergre
maiergre
commented
Nov 7, 2014

Copy link


Copy Markdown

ContributorAuthor
@ktoso I was wondering whether you had a chance to look at this pull request
@ktoso
ktoso
commented
Nov 7, 2014

Copy link


Copy Markdown

Collaborator
Sorry, not yet, was very busy with Akka this week. But should be able to

look tomorrow :-)
Thanks for your patience!
Konrad

(sent from mobile)

On 7 Nov 2014 19:20, "Gregor Maier" notifications@github.com wrote:
@ktosohttps://github.com/ktoso I was wondering whether you had a

chance to look at this pull request
—

Reply to this email directly or view it on GitHub
#135 (comment)

.
ktoso
ktoso
reviewed
Nov 8, 2014
 View reviewed changes

Comment threadsrc/main/java/pl/project13/maven/git/GitDirLocator.java
@ktosoktosoNov 8, 2014

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gitdir is always != null here
@ktoso
ktoso
commented
Nov 9, 2014

Copy link


Copy Markdown

Collaborator
Seems good to me, and tests pass. Unless I missed some edge case this should be fine - thanks for the contribution!
ktoso added a commit
that referenced
this pull request
Nov 9, 2014
@ktoso
Merge pull request#135from maiergre/master
77679ab
Improve gitdir handling with submodules
@ktoso
ktoso
merged commit 77679ab
into
git-commit-id:masterNov 9, 2014
@ktosoktoso
added this to the 2.1.12 milestone
Dec 8, 2014
@klion26
klion26
commented
Aug 31, 2024

Copy link


Copy Markdown

Hi thanks for the great project, so that we can track the commit message in the distribute env easily.
I have a question about searching for .git in the parent directory: do we need to add an option to not search the parent directory when finding the .git dir? I am not sure if this is a normal case or not, I encountered this in some testing processes. thanks.
Now we will search all parent directories from the current directory to find the .git directory, but when I configure failOnNoGitDirectory to true and there is a .git directory in a parent directory, the compilation will not report an error and fail, but the .git directory founded in the parent directory will be used as the information of the project.
The background of this case is that I am contributing to an open-source project. this project wants to report an error without .git under the usual process, but the project also provides a zip package download method to compile without .git. When I tested it, I moved the .git directory to the parent directory of the project and found it passed the compilation and did not report any error.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

2.1.12

Development

Successfully merging this pull request may close these issues.

3 participants

@maiergre@ktoso@klion26

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Improve gitdir handling with submodules by maiergre · Pull Request #135 · git-commit-id/git-commit-id-maven-plugin · GitHub
Skip to content
Improve gitdir handling with submodules - #135
Merged
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Nov 9, 2014
Merged
Improve gitdir handling with submodules#135
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Conversation
@maiergre
@maiergremaiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

Contributor
Thanks for the plugin!
This pull req fixes two issues I encountered:
  • When using git submodules some older git version (e.g., 1.7.9, used by Ubuntu 12.04 LTS) use absolute path in the .git gitdir reference. I've added support for absolute path.
  • When searching for the gitdir the plugin should search the parent directory not the parent project. Esp. with submodules searching the parent project is not correct since the parent might be in a different git repo.
@maiergre
Support absoulte path in git submodule gitdirs
876490b
When using git submodules, some versions of git (e.g., 1.7.9) use
abosulate path in the gitdir reference of the submodules. This patch
adds support to handle absoluate path correctly.
@maiergre
Use parent directory not parent project to locate gitdir
fe371c5
When searching for the git directory of a project the search follows
the project's basedir parent directory rather than following the
project hierarchy (which is not correct)
@maiergre
maiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

ContributorAuthor
FYI, the second point is similar to #128 however #128 doesn't work for submodules
@maiergre
maiergre
commented
Nov 7, 2014

Copy link


Copy Markdown

ContributorAuthor
@ktoso I was wondering whether you had a chance to look at this pull request
@ktoso
ktoso
commented
Nov 7, 2014

Copy link


Copy Markdown

Collaborator
Sorry, not yet, was very busy with Akka this week. But should be able to

look tomorrow :-)
Thanks for your patience!
Konrad

(sent from mobile)

On 7 Nov 2014 19:20, "Gregor Maier" notifications@github.com wrote:
@ktosohttps://github.com/ktoso I was wondering whether you had a

chance to look at this pull request
—

Reply to this email directly or view it on GitHub
#135 (comment)

.
ktoso
ktoso
reviewed
Nov 8, 2014
 View reviewed changes

Comment threadsrc/main/java/pl/project13/maven/git/GitDirLocator.java
@ktosoktosoNov 8, 2014

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gitdir is always != null here
@ktoso
ktoso
commented
Nov 9, 2014

Copy link


Copy Markdown

Collaborator
Seems good to me, and tests pass. Unless I missed some edge case this should be fine - thanks for the contribution!
ktoso added a commit
that referenced
this pull request
Nov 9, 2014
@ktoso
Merge pull request#135from maiergre/master
77679ab
Improve gitdir handling with submodules
@ktoso
ktoso
merged commit 77679ab
into
git-commit-id:masterNov 9, 2014
@ktosoktoso
added this to the 2.1.12 milestone
Dec 8, 2014
@klion26
klion26
commented
Aug 31, 2024

Copy link


Copy Markdown

Hi thanks for the great project, so that we can track the commit message in the distribute env easily.
I have a question about searching for .git in the parent directory: do we need to add an option to not search the parent directory when finding the .git dir? I am not sure if this is a normal case or not, I encountered this in some testing processes. thanks.
Now we will search all parent directories from the current directory to find the .git directory, but when I configure failOnNoGitDirectory to true and there is a .git directory in a parent directory, the compilation will not report an error and fail, but the .git directory founded in the parent directory will be used as the information of the project.
The background of this case is that I am contributing to an open-source project. this project wants to report an error without .git under the usual process, but the project also provides a zip package download method to compile without .git. When I tested it, I moved the .git directory to the parent directory of the project and found it passed the compilation and did not report any error.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

2.1.12

Development

Successfully merging this pull request may close these issues.

3 participants

@maiergre@ktoso@klion26

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Improve gitdir handling with submodules by maiergre · Pull Request #135 · git-commit-id/git-commit-id-maven-plugin · GitHub
Skip to content
Improve gitdir handling with submodules - #135
Merged
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Nov 9, 2014
Merged
Improve gitdir handling with submodules#135
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Conversation
@maiergre
@maiergremaiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

Contributor
Thanks for the plugin!
This pull req fixes two issues I encountered:
  • When using git submodules some older git version (e.g., 1.7.9, used by Ubuntu 12.04 LTS) use absolute path in the .git gitdir reference. I've added support for absolute path.
  • When searching for the gitdir the plugin should search the parent directory not the parent project. Esp. with submodules searching the parent project is not correct since the parent might be in a different git repo.
@maiergre
Support absoulte path in git submodule gitdirs
876490b
When using git submodules, some versions of git (e.g., 1.7.9) use
abosulate path in the gitdir reference of the submodules. This patch
adds support to handle absoluate path correctly.
@maiergre
Use parent directory not parent project to locate gitdir
fe371c5
When searching for the git directory of a project the search follows
the project's basedir parent directory rather than following the
project hierarchy (which is not correct)
@maiergre
maiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

ContributorAuthor
FYI, the second point is similar to #128 however #128 doesn't work for submodules
@maiergre
maiergre
commented
Nov 7, 2014

Copy link


Copy Markdown

ContributorAuthor
@ktoso I was wondering whether you had a chance to look at this pull request
@ktoso
ktoso
commented
Nov 7, 2014

Copy link


Copy Markdown

Collaborator
Sorry, not yet, was very busy with Akka this week. But should be able to

look tomorrow :-)
Thanks for your patience!
Konrad

(sent from mobile)

On 7 Nov 2014 19:20, "Gregor Maier" notifications@github.com wrote:
@ktosohttps://github.com/ktoso I was wondering whether you had a

chance to look at this pull request
—

Reply to this email directly or view it on GitHub
#135 (comment)

.
ktoso
ktoso
reviewed
Nov 8, 2014
 View reviewed changes

Comment threadsrc/main/java/pl/project13/maven/git/GitDirLocator.java
@ktosoktosoNov 8, 2014

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gitdir is always != null here
@ktoso
ktoso
commented
Nov 9, 2014

Copy link


Copy Markdown

Collaborator
Seems good to me, and tests pass. Unless I missed some edge case this should be fine - thanks for the contribution!
ktoso added a commit
that referenced
this pull request
Nov 9, 2014
@ktoso
Merge pull request#135from maiergre/master
77679ab
Improve gitdir handling with submodules
@ktoso
ktoso
merged commit 77679ab
into
git-commit-id:masterNov 9, 2014
@ktosoktoso
added this to the 2.1.12 milestone
Dec 8, 2014
@klion26
klion26
commented
Aug 31, 2024

Copy link


Copy Markdown

Hi thanks for the great project, so that we can track the commit message in the distribute env easily.
I have a question about searching for .git in the parent directory: do we need to add an option to not search the parent directory when finding the .git dir? I am not sure if this is a normal case or not, I encountered this in some testing processes. thanks.
Now we will search all parent directories from the current directory to find the .git directory, but when I configure failOnNoGitDirectory to true and there is a .git directory in a parent directory, the compilation will not report an error and fail, but the .git directory founded in the parent directory will be used as the information of the project.
The background of this case is that I am contributing to an open-source project. this project wants to report an error without .git under the usual process, but the project also provides a zip package download method to compile without .git. When I tested it, I moved the .git directory to the parent directory of the project and found it passed the compilation and did not report any error.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

2.1.12

Development

Successfully merging this pull request may close these issues.

3 participants

@maiergre@ktoso@klion26

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Improve gitdir handling with submodules by maiergre · Pull Request #135 · git-commit-id/git-commit-id-maven-plugin · GitHub
Skip to content
Improve gitdir handling with submodules - #135
Merged
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Nov 9, 2014
Merged
Improve gitdir handling with submodules#135
ktoso merged 2 commits into
git-commit-id:masterfrom 
maiergre:master
Conversation
@maiergre
@maiergremaiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

Contributor
Thanks for the plugin!
This pull req fixes two issues I encountered:
  • When using git submodules some older git version (e.g., 1.7.9, used by Ubuntu 12.04 LTS) use absolute path in the .git gitdir reference. I've added support for absolute path.
  • When searching for the gitdir the plugin should search the parent directory not the parent project. Esp. with submodules searching the parent project is not correct since the parent might be in a different git repo.
@maiergre
Support absoulte path in git submodule gitdirs
876490b
When using git submodules, some versions of git (e.g., 1.7.9) use
abosulate path in the gitdir reference of the submodules. This patch
adds support to handle absoluate path correctly.
@maiergre
Use parent directory not parent project to locate gitdir
fe371c5
When searching for the git directory of a project the search follows
the project's basedir parent directory rather than following the
project hierarchy (which is not correct)
@maiergre
maiergre
commented
Oct 30, 2014

Copy link


Copy Markdown

ContributorAuthor
FYI, the second point is similar to #128 however #128 doesn't work for submodules
@maiergre
maiergre
commented
Nov 7, 2014

Copy link


Copy Markdown

ContributorAuthor
@ktoso I was wondering whether you had a chance to look at this pull request
@ktoso
ktoso
commented
Nov 7, 2014

Copy link


Copy Markdown

Collaborator
Sorry, not yet, was very busy with Akka this week. But should be able to

look tomorrow :-)
Thanks for your patience!
Konrad

(sent from mobile)

On 7 Nov 2014 19:20, "Gregor Maier" notifications@github.com wrote:
@ktosohttps://github.com/ktoso I was wondering whether you had a

chance to look at this pull request
—

Reply to this email directly or view it on GitHub
#135 (comment)

.
ktoso
ktoso
reviewed
Nov 8, 2014
 View reviewed changes

Comment threadsrc/main/java/pl/project13/maven/git/GitDirLocator.java
@ktosoktosoNov 8, 2014

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gitdir is always != null here
@ktoso
ktoso
commented
Nov 9, 2014

Copy link


Copy Markdown

Collaborator
Seems good to me, and tests pass. Unless I missed some edge case this should be fine - thanks for the contribution!
ktoso added a commit
that referenced
this pull request
Nov 9, 2014
@ktoso
Merge pull request#135from maiergre/master
77679ab
Improve gitdir handling with submodules
@ktoso
ktoso
merged commit 77679ab
into
git-commit-id:masterNov 9, 2014
@ktosoktoso
added this to the 2.1.12 milestone
Dec 8, 2014
@klion26
klion26
commented
Aug 31, 2024

Copy link


Copy Markdown

Hi thanks for the great project, so that we can track the commit message in the distribute env easily.
I have a question about searching for .git in the parent directory: do we need to add an option to not search the parent directory when finding the .git dir? I am not sure if this is a normal case or not, I encountered this in some testing processes. thanks.
Now we will search all parent directories from the current directory to find the .git directory, but when I configure failOnNoGitDirectory to true and there is a .git directory in a parent directory, the compilation will not report an error and fail, but the .git directory founded in the parent directory will be used as the information of the project.
The background of this case is that I am contributing to an open-source project. this project wants to report an error without .git under the usual process, but the project also provides a zip package download method to compile without .git. When I tested it, I moved the .git directory to the parent directory of the project and found it passed the compilation and did not report any error.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

2.1.12

Development

Successfully merging this pull request may close these issues.

3 participants

@maiergre@ktoso@klion26