Re: [PATCH v8 0/2] Submodule object path

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 11, 2015, 01:10 UTC
Message-ID: <xmqqoah9222y.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1441922231-18270-1-git-send-email-max@max630.net>

Max Kirillov <max@max630.net> writes:

> * There are more conflicts in pu with [1], not sure
>   what should I do about it.
>
> [1] http://thread.gmane.org/gmane.comp.version-control.git/276628

I do not think conflicts got any worse than before. Between the result of merging this round and the previous one to 'pu', the only difference in path.c that conflicts with [1] I see is essentially a no-op (the diff attached at the end of this essage).

When I push the updated 'pu' out, could you please check

    $ git log --oneline --first-parent origin/master..origin/pu

to find the place your topic is merged (I am planning to make it "3af7cd6 Merge branch 'mk/submodule-gitdir-path' into pu", but please do not rely on the exact commit object name; I may have to redo the integration if I find some breakages caused by this or any other topic), and then eyeballing (call that merge $m) output of

    $ git diff $m^ $m

to see if there is anything I screwed up?

Thanks.

diff --git a/path.c b/path.c
index 776d8f0..2725bc3 100644
--- a/path.c
+++ b/path.c
@@ -466,11 +466,11 @@ static void do_submodule_path(struct strbuf *buf, const char *path,
 
 	strbuf_vaddf(buf, fmt, args);
 
-	if (get_common_dir_noenv(&git_submodule_common_dir, git_submodule_dir.buf)) {
+	if (get_common_dir_noenv(&git_submodule_common_dir, git_submodule_dir.buf))
 		update_common_dir(buf, git_submodule_dir.len, git_submodule_common_dir.buf);
-	}
 
 	strbuf_cleanup_path(buf);
+
 	strbuf_release(&git_submodule_dir);
 	strbuf_release(&git_submodule_common_dir);
 }